commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[hurd] 01/01: Allow parallel build


From: Samuel Thibault
Subject: [hurd] 01/01: Allow parallel build
Date: Sat, 27 Feb 2016 14:36:37 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit fff1e145f66838f4d4fdaccecb87c7500198cc58
Author: Samuel Thibault <address@hidden>
Date:   Sat Feb 27 15:36:22 2016 +0100

    Allow parallel build
    
    * patches/parallel_build.diff: New patch to fix parallel install.
    * control: Allow parallel build.
---
 debian/changelog                   |  2 ++
 debian/patches/parallel_build.diff | 24 ++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 932bcf3..32ad61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ hurd (1:0.7.git20160223-2) UNRELEASED; urgency=medium
     - Avoid hurd-dev depend on hurd in stage3, for the same reason.
   * Move stage1 hurd-dev content to hurd-headers-dev, and stage2 hurd-dev
     content to libihash-dev.
+  * patches/parallel_build.diff: New patch to fix parallel install.
+  * control: Allow parallel build.
 
  -- Samuel Thibault <address@hidden>  Fri, 26 Feb 2016 11:46:35 +0000
 
diff --git a/debian/patches/parallel_build.diff 
b/debian/patches/parallel_build.diff
new file mode 100644
index 0000000..56eda91
--- /dev/null
+++ b/debian/patches/parallel_build.diff
@@ -0,0 +1,24 @@
+commit eeeb27ee14064dff84c833b4359d43d9869a9342
+Author: Samuel Thibault <address@hidden>
+Date:   Sat Feb 27 15:34:17 2016 +0100
+
+    Fix parallel install
+    
+    * sutils/Makefile (install): Do not depend on $(prefix)/dev.
+    ($(prefix)/dev/MAKEDEV): Depend on $(prefix)/devĀ²
+
+diff --git a/sutils/Makefile b/sutils/Makefile
+index 773a7da..e30bfb7 100644
+--- a/sutils/Makefile
++++ b/sutils/Makefile
+@@ -36,8 +36,8 @@ fsck: fstab.o clookup.o
+ swapon swapoff: ../libstore/libstore.a default_pagerUser.o
+ $(progs): %: %.o ../libshouldbeinlibc/libshouldbeinlibc.a
+ 
+-install: $(prefix)/dev $(prefix)/dev/MAKEDEV
+-$(prefix)/dev/MAKEDEV:
++install: $(prefix)/dev/MAKEDEV
++$(prefix)/dev/MAKEDEV: $(prefix)/dev
+       ln -s ../sbin/MAKEDEV $@
+ $(prefix)/dev:
+       @$(MKINSTALLDIRS) $@
diff --git a/debian/patches/series b/debian/patches/series
index cfc105b..f13cbbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ dl_origin.patch
 cross-link.patch
 procfs-compatible
 crash-logging.patch
+parallel_build.diff
diff --git a/debian/rules b/debian/rules
index b6f05d9..9f020e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= 
$${source:Version}), ' -W libc0.3-dev libparted-dev zlib1g-dev libbz2-dev 
uuid-dev libblkid-dev)
 
 %:
-       dh $@ -Bbuild-deb --with autotools_dev,autoreconf
+       dh $@ -Bbuild-deb --with autotools_dev,autoreconf --parallel
 
 override_dh_auto_configure:
        dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) 
$(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]