This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.
commit 3d8818f608647f47c86ccfb22015781444407b31
Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
Date: Wed Apr 25 21:31:32 2018 +0200
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.
---
debian/rules | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/debian/rules b/debian/rules
index d082e36..5a0af64 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
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/nx-libs.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
