Commit d017d211 authored by Mihai Moldovan's avatar Mihai Moldovan

nx-libs.spec: pass CDEBUGSFLAGS and friends directly to the make command in %build.

parent 07d30835
......@@ -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:
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment