Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 74101 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.config.orig (-6 / +14 lines)
Lines 180-186 Link Here
180
180
181
# Here, $(SONAME) resolves to the soname for the shared library being created.
181
# Here, $(SONAME) resolves to the soname for the shared library being created.
182
# The following are gcc options.  This works on GNU libc systems.
182
# The following are gcc options.  This works on GNU libc systems.
183
LDSHLIB = -shared -Wl,-soname,$(SONAME)
183
#LDSHLIB = -shared -Wl,-soname,$(SONAME)
184
# You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
184
# You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
185
# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
185
# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
186
# documentation and doesn't exist in at least one non-BeOS installation.
186
# documentation and doesn't exist in at least one non-BeOS installation.
Lines 201-206 Link Here
201
#AIX Visual Age C:
201
#AIX Visual Age C:
202
#LDSHLIB = -qmkshrobj
202
#LDSHLIB = -qmkshrobj
203
203
204
LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dynlib
205
204
# LDRELOC is the command to combine two .o files (relocateable object files)
206
# LDRELOC is the command to combine two .o files (relocateable object files)
205
# into a single .o file that can later be linked into something else.  NONE
207
# into a single .o file that can later be linked into something else.  NONE
206
# means no such command is available.
208
# means no such command is available.
Lines 225-231 Link Here
225
# copy of Pbmtext used 16K less real memory when built with -fpic than
227
# copy of Pbmtext used 16K less real memory when built with -fpic than
226
# when built without.  2001.06.02.
228
# when built without.  2001.06.02.
227
229
228
CFLAGS_SHLIB = 
230
#CFLAGS_SHLIB = 
229
# Solaris or SunOS with gcc, and NetBSD:
231
# Solaris or SunOS with gcc, and NetBSD:
230
#CFLAGS_SHLIB = -fpic
232
#CFLAGS_SHLIB = -fpic
231
#CFLAGS_SHLIB = -fPIC
233
#CFLAGS_SHLIB = -fPIC
Lines 233-238 Link Here
233
#CFLAGS_SHLIB = -Kpic
235
#CFLAGS_SHLIB = -Kpic
234
#CFLAGS_SHLIB = -KPIC
236
#CFLAGS_SHLIB = -KPIC
235
237
238
CFLAGS_SHLIB = -fno-common
239
236
# SHLIB_CLIB is the link option to include the C library in a shared library,
240
# SHLIB_CLIB is the link option to include the C library in a shared library,
237
# normally "-lc".  On typical systems, this serves no purpose.  On some,
241
# normally "-lc".  On typical systems, this serves no purpose.  On some,
238
# though, it causes information about which C library to use to be recorded
242
# though, it causes information about which C library to use to be recorded
Lines 453-459 Link Here
453
#Netpbm library functions.  The value is used only in make file tests.
457
#Netpbm library functions.  The value is used only in make file tests.
454
# "unixshared" means a unix-style shared library, typically named like 
458
# "unixshared" means a unix-style shared library, typically named like 
455
# libxyz.so.2.3
459
# libxyz.so.2.3
456
NETPBMLIBTYPE = unixshared
460
#NETPBMLIBTYPE = unixshared
457
# "unixstatic" means a unix-style static library, (like libxyz.a)
461
# "unixstatic" means a unix-style static library, (like libxyz.a)
458
#NETPBMLIBTYPE = unixstatic
462
#NETPBMLIBTYPE = unixstatic
459
# "dll" means a Windows DLL shared library
463
# "dll" means a Windows DLL shared library
Lines 461-470 Link Here
461
# "dylib" means a Darwin/Mac OS shared library
465
# "dylib" means a Darwin/Mac OS shared library
462
#NETPBMLIBTYPE = dylib
466
#NETPBMLIBTYPE = dylib
463
467
468
NETPBMLIBTYPE = dylib
469
464
#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
470
#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
465
#selected above.  All this is used for is to construct library names.
471
#selected above.  All this is used for is to construct library names.
466
#The make files never examine the actual value.
472
#The make files never examine the actual value.
467
NETPBMLIBSUFFIX = so
473
#NETPBMLIBSUFFIX = so
474
475
NETPBMLIBSUFFIX = dylib
468
476
469
# "a" is the suffix for unix-style static libraries.  It is also
477
# "a" is the suffix for unix-style static libraries.  It is also
470
# traditionally used for shared libraries on AIX.  The Visual Age C
478
# traditionally used for shared libraries on AIX.  The Visual Age C
Lines 487-494 Link Here
487
#and installed in addition to whatever library type you specified by
495
#and installed in addition to whatever library type you specified by
488
#NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
496
#NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
489
#STATICLIB_TOO simply has no effect.
497
#STATICLIB_TOO simply has no effect.
490
STATICLIB_TOO = y
498
#STATICLIB_TOO = y
491
#STATICLIB_TOO = n
499
STATICLIB_TOO = n
492
500
493
#STATICLIBSUFFIX is the suffix that static libraries have.  It's
501
#STATICLIBSUFFIX is the suffix that static libraries have.  It's
494
#meaningless if you aren't building static libraries.
502
#meaningless if you aren't building static libraries.

Return to bug 74101