[X2Go-Commits] [nx-libs] 01/01: 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:43:04 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.
commit a88fc7163fe292ad13e6adbb04ee21bbb06c9545
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Mar 26 00:23:09 2015 +0100
Only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise.
Affected:
- 0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
- 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
- 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
---
debian/changelog | 8 +++++++-
...t-library-naming-scheme-on-OS-X.full+lite.patch | 12 +++++++-----
...orrect-library-naming-scheme-on-OS-X.full.patch | 12 +++++++-----
...orrect-library-naming-scheme-on-OS-X.full.patch | 12 +++++++-----
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 62513f8..3d58ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
- * Continue development
+ [ Mihai Moldovan ]
+ * Only use the first three numbers in the full version for current_version
+ on OS X. ld(1) on 10.6 fails otherwise.
+ Affected:
+ - 0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+ - 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
+ - 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
-- X2Go Release Manager <git-admin at x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
diff --git a/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
index 6a9dab8..04332ba 100644
--- a/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+++ b/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
@@ -1,9 +1,10 @@
Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
Author: Clemens Lang <cal at macports.org>
+v2: Make sure only the first three digits are used for current_version. (Mihai Moldovan)
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
-@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u
+@@ -91,9 +91,18 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u
LIBRARY = Xcomp
LIBNAME = lib$(LIBRARY)
@@ -11,7 +12,8 @@ Author: Clemens Lang <cal at macports.org>
+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)
@@ -21,7 +23,7 @@ Author: Clemens Lang <cal at macports.org>
LIBARCHIVE = lib$(LIBRARY).a
LIBCYGSHARED = cyg$(LIBRARY).dll
-@@ -232,7 +240,7 @@ COBJ = $(CSRC:.c=.o)
+@@ -232,7 +241,7 @@ COBJ = $(CSRC:.c=.o)
CXXOBJ = $(CXXSRC:.cpp=.o)
$(LIBFULL): $(CXXOBJ) $(COBJ)
@@ -30,7 +32,7 @@ Author: Clemens Lang <cal at macports.org>
$(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD)
-@@ -278,9 +286,9 @@ install.lib: all
+@@ -278,9 +287,9 @@ install.lib: all
./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
@@ -43,7 +45,7 @@ Author: Clemens Lang <cal at macports.org>
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-@@ -293,9 +301,9 @@ uninstall.bin:
+@@ -293,9 +302,9 @@ uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
diff --git a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
index 0db573f..2a2ff66 100644
--- a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
+++ b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
@@ -1,9 +1,10 @@
Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
Author: Clemens Lang <cal at macports.org>
+v2: Make sure only the first three digits are used for current_version. (Mihai Moldovan)
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
-@@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/
+@@ -82,9 +82,18 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/
LIBRARY = Xcompext
LIBNAME = lib$(LIBRARY)
@@ -11,7 +12,8 @@ Author: Clemens Lang <cal at macports.org>
+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)
@@ -21,7 +23,7 @@ Author: Clemens Lang <cal at macports.org>
LIBARCHIVE = lib$(LIBRARY).a
LIBCYGSHARED = cyg$(LIBRARY).dll
-@@ -113,7 +121,7 @@ COBJ = $(CSRC:.c=.o)
+@@ -113,7 +122,7 @@ COBJ = $(CSRC:.c=.o)
CXXOBJ = $(CXXSRC:.cpp=.o)
$(LIBFULL): $(CXXOBJ) $(COBJ)
@@ -30,7 +32,7 @@ Author: Clemens Lang <cal at macports.org>
$(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD)
-@@ -159,8 +167,8 @@ install.lib: all
+@@ -159,8 +168,8 @@ install.lib: all
./mkinstalldirs $(DESTDIR)${libdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
@@ -41,7 +43,7 @@ Author: Clemens Lang <cal at macports.org>
$(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-@@ -172,8 +180,8 @@ uninstall.bin:
+@@ -172,8 +181,8 @@ uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
diff --git a/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
index 3099698..95767c9 100644
--- a/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
+++ b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
@@ -1,9 +1,10 @@
Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
Author: Clemens Lang <cal at macports.org>
+v2: Make sure only the first three digits are used for current_version. (Mihai Moldovan)
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
-@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/u
+@@ -103,9 +103,18 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/u
LIBRARY = Xcompshad
LIBNAME = lib$(LIBRARY)
@@ -11,7 +12,8 @@ Author: Clemens Lang <cal at macports.org>
+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)
@@ -21,7 +23,7 @@ Author: Clemens Lang <cal at macports.org>
LIBARCHIVE = lib$(LIBRARY).a
MSRC = Main.c
-@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBS
+@@ -146,7 +155,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBS
endif
$(LIBFULL): $(CXXOBJ) $(COBJ)
@@ -30,7 +32,7 @@ Author: Clemens Lang <cal at macports.org>
$(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD)
-@@ -193,9 +201,9 @@ install.lib: all
+@@ -193,9 +202,9 @@ install.lib: all
$(INSTALL_DIR) $(DESTDIR)${libdir}
$(INSTALL_DIR) $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
@@ -43,7 +45,7 @@ Author: Clemens Lang <cal at macports.org>
$(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-@@ -207,9 +215,9 @@ uninstall.bin:
+@@ -207,9 +216,9 @@ uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
--
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