[X2Go-Commits] [nx-libs] 01/01: Fixup merge with bugfix/rpath.

git-admin at x2go.org git-admin at x2go.org
Fri Dec 29 22:43:29 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit 40cbeb62b0867d2a6fcbfd693bb69263294872e2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Dec 29 22:43:25 2017 +0100

    Fixup merge with bugfix/rpath.
---
 nx-X11/config/cf/gnuLib.rules | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules
index ea0df25..e9169bd 100644
--- a/nx-X11/config/cf/gnuLib.rules
+++ b/nx-X11/config/cf/gnuLib.rules
@@ -80,14 +80,6 @@ XCOMM XXX Maybe superfluous.
 #define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$$ORIGIN/$(BUILDLIBDIR)
 #endif
 #endif
-#ifndef ExtraInstallLoadFlags
-#ifdef UseInstalled
-XCOMM XXX Maybe superfluous.
-#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
-#else
-#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR)
-#endif
-#endif
 
 /*
  * InstallSharedLibrary - generate rules to install the shared library.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list