diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-23 14:27:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 13:09:21 +0200 |
| commit | d650a0b47eadeb675e2d2cf03ad10a4dbc564971 (patch) | |
| tree | 5ae7d463f5a67ddb3a35f0ab86fc225c386513a3 /nx-libs.spec | |
| parent | 4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd (diff) | |
| download | nx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.tar.gz nx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.tar.bz2 nx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.zip | |
OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts.
Note:
- The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those
options over into the variable CDEBUGFLAGS.
- LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS.
This change also includes a slight change in the nx-X11 build order.
Old build order:
Main Makefile:
- [...]
- libNX_X11
+ implicitly building nxcomp
+ implicitly building nxcompext
- [...]
- nxagent
+ implicitly building nxcompshad
- [...]
New build ordner:
Main Makefile:
- [...]
- nxcomp
- setup nx-X11 build env
+ cd nx-X11 && make BuildEnv
- nx-X11/lib/*
- nxcompext
- nxcompshad
- [...]
- nxagent
- [...]
Fixes ArcticaProject/nx-libs#141
Fixes X2GoBTS#84
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 770f1870a..8b2ecb09a 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -454,6 +454,7 @@ 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} %install |