diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2015-02-13 13:27:42 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-13 13:27:42 +0100 |
| commit | c4a8556c45786c83b04b2e958234cb4c724e1910 (patch) | |
| tree | 753b7f4d4ff8eacc0bbf79be7251facfa4aea0a1 /nxcompshad | |
| parent | d4d3fe0e6e77a58e68defc5895a589a681d7d092 (diff) | |
| download | nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.gz nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.bz2 nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.zip | |
Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch).
We really want to make use of rpm's automatic dependency finding.
Binaries are scanned for DT_NEEDED entries, the latter of which are
then used for populating the "Requires"-type deps. The "nxagent"
binary for example would require libX11.so.6. That incurs problems:
1. A package manager told to install nxagent could select xorg-x11
rather than nx-libs, even though nxagent depends on the NX version.
2. A package manager told to install $some_program could select nx-libs
rather than xorg-x11 (since both provide libX11.so.6), but, since
the NX library is in an obscure directory, running $some_program
would fail as libX11.so.6 is not found.
To solve this, give the NX libraries unique names different from the
Xorg ones.
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 00bca25c9..f7e89a6f2 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -lX11 +LIBS = @LIBS@ -lNX_X11 # # Only if THREADS is defined. @@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lXtst -lXrandr -lXdamage +EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) |