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
f7e6c45a
Commit
f7e6c45a
authored
Nov 19, 2011
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
parent
954557e9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
0 deletions
+34
-0
changelog
debian/changelog
+1
-0
002_nxcompshad-build-against-nx-x11-only.patch
...an/patches/002_nxcompshad-build-against-nx-x11-only.patch
+32
-0
series
debian/patches/series
+1
-0
No files found.
debian/changelog
View file @
f7e6c45a
...
...
@@ -4,5 +4,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Use NX adapted LD_LIBRARY_PATH in debian/rules.
* Add quilt as build dependency.
* Add main Makefile via patch: 001_add-main-makefile.patch.
* Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
debian/patches/002_nxcompshad-build-against-nx-x11-only.patch
0 → 100644
View file @
f7e6c45a
Build nxcompshad against own nx-X11 sources instead of the system's X11.
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -48,7 +48,7 @@
CCDEFINES =
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ -L/usr/X11R6/lib -lX11
+LIBS = @LIBS@ -lX11
#
# Only if THREADS is defined.
@@ -162,7 +162,7 @@
-Wl,--enable-auto-import \
-Wl,--whole-archive ${LIBARCHIVE} \
-Wl,--no-whole-archive \
- ${LIBS} -L/usr/X11R6/lib
+ ${LIBS}
$(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
# $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -19,7 +19,7 @@
if test -d "../nx-X11/exports/include" ; then
CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
- LIBS="$LIBS -L../nx-X11/exports/lib"
+ LIBS="-L../nx-X11/exports/lib"
fi
dnl Check whether --with-ipaq was given.
debian/patches/series
View file @
f7e6c45a
001_add-main-makefile.patch
002_nxcompshad-build-against-nx-x11-only.patch
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