aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch')
-rw-r--r--debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch60
1 files changed, 0 insertions, 60 deletions
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
deleted file mode 100644
index 04332baad..000000000
--- a/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
-Author: Clemens Lang <cal@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,18 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u
- LIBRARY = Xcomp
-
- LIBNAME = lib$(LIBRARY)
-+ifeq ($(shell uname),Darwin)
-+LIBFULL = lib$(LIBRARY).$(VERSION).dylib
-+LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
-+LIBSHARED = lib$(LIBRARY).dylib
-+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)
- LIBSHARED = lib$(LIBRARY).so
-+LIBFLAGS =
-+endif
- LIBARCHIVE = lib$(LIBRARY).a
-
- LIBCYGSHARED = cyg$(LIBRARY).dll
-@@ -232,7 +241,7 @@ COBJ = $(CSRC:.c=.o)
- CXXOBJ = $(CXXSRC:.cpp=.o)
-
- $(LIBFULL): $(CXXOBJ) $(COBJ)
-- $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-+ $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-
- $(LIBLOAD): $(LIBFULL)
- rm -f $(LIBLOAD)
-@@ -278,9 +287,9 @@ install.lib: all
- ./mkinstalldirs $(DESTDIR)${libdir}
- ./mkinstalldirs $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
-- $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
-+ $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
- $(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 +302,9 @@ uninstall.bin:
-
- uninstall.lib:
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h