diff options
author | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:04:21 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:08:44 +0100 |
commit | 06b51cc33dccbc8efd47e8449b19439c50f33b1e (patch) | |
tree | a8fdf50ee71404995cf0b032cbcfb32c84461d6a /debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch | |
parent | 91f1fed27236f0fa880971fc4cad13e95c794afc (diff) | |
download | nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.tar.gz nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.tar.bz2 nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.zip |
nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available.
Also rename to account for dependency changes:
- 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch =>
0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
- 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch =>
0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
- 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch =>
0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
- 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch =>
0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
- 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
- 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
- 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
=>
0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
- 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
=>
0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
Diffstat (limited to 'debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch')
-rw-r--r-- | debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch new file mode 100644 index 000000000..0db573f21 --- /dev/null +++ b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch @@ -0,0 +1,54 @@ +Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. +Author: Clemens Lang <cal@macports.org> + +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/ + LIBRARY = Xcompext + + LIBNAME = lib$(LIBRARY) ++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) ++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 +@@ -113,7 +121,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) +@@ -159,8 +167,8 @@ install.lib: all + ./mkinstalldirs $(DESTDIR)${libdir} + ./mkinstalldirs $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} +- $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} +- $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} ++ $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} ++ $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + +@@ -172,8 +180,8 @@ uninstall.bin: + + uninstall.lib: + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) +- $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 +- $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so ++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD) ++ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + echo "Running ldconfig tool, this may take a while..." && ldconfig || true |