[patch] improved netpbm-10.28 darwin patch

netpbm-10.28-darwin.patch (text/plain), 2.89 KB, created by Fabian Groffen on 2005-08-13 12:41:50 UTC

--- Makefile.config.orig	2005-08-13 14:07:13.000000000 +0200
+++ Makefile.config	2005-08-13 14:08:47.000000000 +0200
@@ -210,7 +210,7 @@
 
 # Here, $(SONAME) resolves to the soname for the shared library being created.
 # The following are gcc options.  This works on GNU libc systems.
-LDSHLIB = -shared -Wl,-soname,$(SONAME)
+#LDSHLIB = -shared -Wl,-soname,$(SONAME)
 # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
 # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
 # documentation and doesn't exist in at least one non-BeOS installation.
@@ -231,6 +231,8 @@
 #AIX Visual Age C:
 #LDSHLIB = -qmkshrobj
 
+LDSHLIB = -dynamiclib -install_name /usr/lib/netpbm/libnetpbm.$(MAJ).dylib
+# note this is a hack not to use $(NETPBM_RUNTIME_PATH) because if we set it the script thinks we want to use -rpath on the linker!
 # LDRELOC is the command to combine two .o files (relocateable object files)
 # into a single .o file that can later be linked into something else.  NONE
 # means no such command is available.
@@ -262,7 +264,7 @@
 # compiler/linker).  Build-time linking fails without it.  I don't
 # know why -- history seems to be repeating itself.  2005.02.23.
 
-CFLAGS_SHLIB = 
+#CFLAGS_SHLIB = 
 # Solaris or SunOS with gcc, and NetBSD:
 #CFLAGS_SHLIB = -fpic
 #CFLAGS_SHLIB = -fPIC
@@ -270,6 +272,8 @@
 #CFLAGS_SHLIB = -Kpic
 #CFLAGS_SHLIB = -KPIC
 
+CFLAGS_SHLIB = -fno-common
+
 # SHLIB_CLIB is the link option to include the C library in a shared library,
 # normally "-lc".  On typical systems, this serves no purpose.  On some,
 # though, it causes information about which C library to use to be recorded
@@ -497,7 +501,7 @@
 #Netpbm library functions.  The value is used only in make file tests.
 # "unixshared" means a unix-style shared library, typically named like 
 # libxyz.so.2.3
-NETPBMLIBTYPE = unixshared
+#NETPBMLIBTYPE = unixshared
 # "unixstatic" means a unix-style static library, (like libxyz.a)
 #NETPBMLIBTYPE = unixstatic
 # "dll" means a Windows DLL shared library
@@ -505,10 +509,14 @@
 # "dylib" means a Darwin/Mac OS shared library
 #NETPBMLIBTYPE = dylib
 
+NETPBMLIBTYPE = dylib
+
 #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
 #selected above.  All this is used for is to construct library names.
 #The make files never examine the actual value.
-NETPBMLIBSUFFIX = so
+#NETPBMLIBSUFFIX = so
+
+NETPBMLIBSUFFIX = dylib
 
 # "a" is the suffix for unix-style static libraries.  It is also
 # traditionally used for shared libraries on AIX.  The Visual Age C
@@ -531,8 +539,8 @@
 #and installed in addition to whatever library type you specified by
 #NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
 #STATICLIB_TOO simply has no effect.
-STATICLIB_TOO = y
-#STATICLIB_TOO = n
+#STATICLIB_TOO = y
+STATICLIB_TOO = n
 
 #STATICLIBSUFFIX is the suffix that static libraries have.  It's
 #meaningless if you aren't building static libraries.