[X2Go-Commits] [nx-libs] 01/01: nx-libs.spec: pass CDEBUGSFLAGS and friends directly to the make command in %build.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit d017d211d2a56f9b07b788d8985f96be535ffce2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 16 10:26:16 2017 +0200

    nx-libs.spec: pass CDEBUGSFLAGS and friends directly to the make command in %build.
---
 debian/changelog | 1 +
 nx-libs.spec     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4bf56d..295c475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
       Backported from Arctica GH 3.6.x branch.
       v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
     - Drop ugly sed hack to push optflags to build system.
+    - Pass CDEBUGSFLAGS and friends directly to the make command in %build.
   * debian/:
     - Add x2goagent.options file for compatibility with x2goserver nightly.
   * debian/roll-tarballs.sh:
diff --git a/nx-libs.spec b/nx-libs.spec
index 85cf8b1..cdf362d 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -764,8 +764,8 @@ chmod a+x my_configure;
 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
 export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
 export LOCAL_LDFLAGS="%{__global_ldflags}"
-export CDEBUGFLAGS="%{__global_cppflags} %{__global_cflags}"
-make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir}
+export CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags}"
+make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBSGLOBALSFLAGS="${SHLIBSGLOBALSFLAGS}"
 
 %install
 make install \

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git