[X2Go-Commits] [nx-libs] 01/01: nxcomp{, ext, shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise.

git-admin at x2go.org git-admin at x2go.org
Thu Mar 26 00:32:41 CET 2015


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

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

commit d86ce9c7a44118082612c3cfb3a866b9f8f6098f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 26 00:32:27 2015 +0100

    nxcomp{,ext,shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise.
---
 nxcomp/Makefile.in     |    3 ++-
 nxcompext/Makefile.in  |    3 ++-
 nxcompshad/Makefile.in |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index e571b3c..6022747 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -95,7 +95,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index da464bd..b33c5aa 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -86,7 +86,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 5ea2863..41d644f 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -107,7 +107,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list