projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nicira-ext: Generalize nx_mp_fields into nx_hash_fields.
[openvswitch]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index bbc7357e54ddec9a09a94a95a1e2eb9068aa027c..357285f7d1951ed5b9702ed02f0f3b827cf1075c 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-14,9
+14,11
@@
BUILD_NUMBER = 0
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
BUILD_NUMBER = 0
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += -j$(NUMJOBS)
+PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+PARALLEL =
endif
endif
+MAKEFLAGS += $(PARALLEL)
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@
-34,7
+36,7
@@
configure-stamp:
cd _debian && ( \
test -e Makefile || \
../configure --prefix=/usr --localstatedir=/var --enable-ssl \
cd _debian && ( \
test -e Makefile || \
../configure --prefix=/usr --localstatedir=/var --enable-ssl \
- --with-build-number=$(BUILD_NUMBER) \
+ --
sysconfdir=/etc --
with-build-number=$(BUILD_NUMBER) \
CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
touch configure-stamp
CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
touch configure-stamp
@@
-45,7
+47,8
@@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
$(MAKE) -C _debian
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
build-arch-stamp: configure-stamp
$(MAKE) -C _debian
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- if $(MAKE) -C _debian check; then :; else \
+ if $(MAKE) -C _debian check TESTSUITEFLAGS='$(PARALLEL)'; then :; \
+ else \
cat _debian/tests/testsuite.log; \
exit 1; \
fi
cat _debian/tests/testsuite.log; \
exit 1; \
fi
@@
-98,13
+101,13
@@
binary-common:
dh_installexamples
dh_installdebconf
dh_installlogrotate
dh_installexamples
dh_installdebconf
dh_installlogrotate
- dh_installinit
+ dh_installinit
-R
dh_installcron
dh_installman
dh_link
dh_strip --dbg-package=openvswitch-dbg
dh_compress
dh_installcron
dh_installman
dh_link
dh_strip --dbg-package=openvswitch-dbg
dh_compress
- dh_fixperms
-X var/log/core
+ dh_fixperms
dh_pysupport
dh_perl
dh_makeshlibs
dh_pysupport
dh_perl
dh_makeshlibs