[patch] Patch applied by the new ebuild

macos.patch (text/plain), 2.73 KB, created by Benjamin Braatz on 2005-03-20 13:34:07 UTC

--- Makefile.config.orig	Fri Mar 18 13:57:41 2005
+++ Makefile.config	Fri Mar 18 14:03:02 2005
@@ -180,7 +180,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.
@@ -201,6 +201,8 @@
 #AIX Visual Age C:
 #LDSHLIB = -qmkshrobj
 
+LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dynlib
+
 # 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.
@@ -225,7 +227,7 @@
 # copy of Pbmtext used 16K less real memory when built with -fpic than
 # when built without.  2001.06.02.
 
-CFLAGS_SHLIB = 
+#CFLAGS_SHLIB = 
 # Solaris or SunOS with gcc, and NetBSD:
 #CFLAGS_SHLIB = -fpic
 #CFLAGS_SHLIB = -fPIC
@@ -233,6 +235,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
@@ -453,7 +457,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
@@ -461,10 +465,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
@@ -487,8 +495,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.