Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
d017d211
Commit
d017d211
authored
Oct 16, 2017
by
Mihai Moldovan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nx-libs.spec: pass CDEBUGSFLAGS and friends directly to the make command in %build.
parent
07d30835
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
changelog
debian/changelog
+1
-0
nx-libs.spec
nx-libs.spec
+2
-2
No files found.
debian/changelog
View file @
d017d211
...
@@ -21,6 +21,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
...
@@ -21,6 +21,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
Backported from Arctica GH 3.6.x branch.
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
- Drop ugly sed hack to push optflags to build system.
- Drop ugly sed hack to push optflags to build system.
- Pass CDEBUGSFLAGS and friends directly to the make command in %build.
* debian/:
* debian/:
- Add x2goagent.options file for compatibility with x2goserver nightly.
- Add x2goagent.options file for compatibility with x2goserver nightly.
* debian/roll-tarballs.sh:
* debian/roll-tarballs.sh:
...
...
nx-libs.spec
View file @
d017d211
...
@@ -764,8 +764,8 @@ chmod a+x my_configure;
...
@@ -764,8 +764,8 @@ chmod a+x my_configure;
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
export LOCAL_LDFLAGS="%{__global_ldflags}"
export LOCAL_LDFLAGS="%{__global_ldflags}"
export CDEBUGFLAGS="%{
__global_cppflags} %{
__global_cflags}"
export CDEBUGFLAGS="%{
?__global_cppflags} %{?
__global_cflags}"
make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir}
make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir}
CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBSGLOBALSFLAGS="${SHLIBSGLOBALSFLAGS}"
%install
%install
make install \
make install \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment