aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--nx-libs.spec4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index c4bf56dab..295c475a2 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 85cf8b13c..cdf362da1 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 \