diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 01:49:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 01:49:43 +0000 |
| commit | 8c0e3bf03288f7af9d32ee166ea4a950cefcc2ce (patch) | |
| tree | e9d1ecef9e843029619f3ef0bbf70c12686f5929 | |
| parent | b897a82b8867a9bb2812e521fa157179b2aff4a7 (diff) | |
Don't use cdbs, it makes use enable ssp, which we don't want for gnumach
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 437826d..00d798c 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html Vcs-Browser: http://git.debian.org/?p=pkg-hurd/gnumach.git Vcs-Git: git://git.debian.org/pkg-hurd/gnumach.git Build-Depends: debhelper (>= 7), mig, sharutils, - autoconf, automake, cdbs + autoconf, automake Standards-Version: 3.9.2 Package: gnumach diff --git a/debian/rules b/debian/rules index c6df7cf..193adc8 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,9 @@ else CFLAGS += -O2 endif -include /usr/share/cdbs/1/class/langcore.mk +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif ifneq (,$(DEB_PARALLEL_JOBS)) MAKEFLAGS += -j$(DEB_PARALLEL_JOBS) |