aboutsummaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-04-25 21:31:32 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-04-25 21:31:32 +0200
commit3d8818f608647f47c86ccfb22015781444407b31 (patch)
tree928910545f6ec747b942e987cb2daa3d27c7008f /debian/rules
parentb817592861d28d0b024d4064973a38d4e9d11741 (diff)
downloadnx-libs-3d8818f608647f47c86ccfb22015781444407b31.tar.gz
nx-libs-3d8818f608647f47c86ccfb22015781444407b31.tar.bz2
nx-libs-3d8818f608647f47c86ccfb22015781444407b31.zip
Revert "debian/rules: Avoid dh_auto_build. It adds -Oline since 11.2 which let's make choke in nx-X11/ subdir on the Makefiles target. Reason unknown."
This reverts commit 94d77e27a7331cd54158ad0bd95f22df22e4dba1.
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules6
1 files changed, 1 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules
index d082e3647..5a0af64e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,6 @@ export LIBDIR = "/usr/lib/$(DEB_HOST_MULTIARCH)"
export LIBEXECDIR = "$(LIBDIR)/nx/bin"
export INCLUDEDIR = "/usr/include/$(DEB_HOST_MULTIARCH)"
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
%:
CONFIGURE="./configure --disable-silent-rules \
--prefix=/usr \
@@ -55,7 +51,7 @@ override_dh_auto_install:
override_dh_auto_build:
debian/compat.sh
- PREFIX=/usr make build -j${NUM_JOBS} CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))'
+ PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))'
override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg