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 210-216 Link Here
210
210
211
# Here, $(SONAME) resolves to the soname for the shared library being created.
211
# Here, $(SONAME) resolves to the soname for the shared library being created.
212
# The following are gcc options.  This works on GNU libc systems.
212
# The following are gcc options.  This works on GNU libc systems.
213
LDSHLIB = -shared -Wl,-soname,$(SONAME)
213
#LDSHLIB = -shared -Wl,-soname,$(SONAME)
214
# You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
214
# You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
215
# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
215
# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
216
# documentation and doesn't exist in at least one non-BeOS installation.
216
# documentation and doesn't exist in at least one non-BeOS installation.
Lines 231-236 Link Here
231
#AIX Visual Age C:
231
#AIX Visual Age C:
232
#LDSHLIB = -qmkshrobj
232
#LDSHLIB = -qmkshrobj
233
233
234
LDSHLIB = -dynamiclib
235
#-install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
234
# LDRELOC is the command to combine two .o files (relocateable object files)
236
# LDRELOC is the command to combine two .o files (relocateable object files)
235
# into a single .o file that can later be linked into something else.  NONE
237
# into a single .o file that can later be linked into something else.  NONE
236
# means no such command is available.
238
# means no such command is available.
Lines 262-268 Link Here
262
# compiler/linker).  Build-time linking fails without it.  I don't
264
# compiler/linker).  Build-time linking fails without it.  I don't
263
# know why -- history seems to be repeating itself.  2005.02.23.
265
# know why -- history seems to be repeating itself.  2005.02.23.
264
266
265
CFLAGS_SHLIB = 
267
#CFLAGS_SHLIB = 
266
# Solaris or SunOS with gcc, and NetBSD:
268
# Solaris or SunOS with gcc, and NetBSD:
267
#CFLAGS_SHLIB = -fpic
269
#CFLAGS_SHLIB = -fpic
268
#CFLAGS_SHLIB = -fPIC
270
#CFLAGS_SHLIB = -fPIC
Lines 270-275 Link Here
270
#CFLAGS_SHLIB = -Kpic
272
#CFLAGS_SHLIB = -Kpic
271
#CFLAGS_SHLIB = -KPIC
273
#CFLAGS_SHLIB = -KPIC
272
274
275
CFLAGS_SHLIB = -fno-common
276
273
# SHLIB_CLIB is the link option to include the C library in a shared library,
277
# SHLIB_CLIB is the link option to include the C library in a shared library,
274
# normally "-lc".  On typical systems, this serves no purpose.  On some,
278
# normally "-lc".  On typical systems, this serves no purpose.  On some,
275
# though, it causes information about which C library to use to be recorded
279
# though, it causes information about which C library to use to be recorded
Lines 497-503 Link Here
497
#Netpbm library functions.  The value is used only in make file tests.
501
#Netpbm library functions.  The value is used only in make file tests.
498
# "unixshared" means a unix-style shared library, typically named like 
502
# "unixshared" means a unix-style shared library, typically named like 
499
# libxyz.so.2.3
503
# libxyz.so.2.3
500
NETPBMLIBTYPE = unixshared
504
#NETPBMLIBTYPE = unixshared
501
# "unixstatic" means a unix-style static library, (like libxyz.a)
505
# "unixstatic" means a unix-style static library, (like libxyz.a)
502
#NETPBMLIBTYPE = unixstatic
506
#NETPBMLIBTYPE = unixstatic
503
# "dll" means a Windows DLL shared library
507
# "dll" means a Windows DLL shared library
Lines 505-514 Link Here
505
# "dylib" means a Darwin/Mac OS shared library
509
# "dylib" means a Darwin/Mac OS shared library
506
#NETPBMLIBTYPE = dylib
510
#NETPBMLIBTYPE = dylib
507
511
512
NETPBMLIBTYPE = dylib
513
508
#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
514
#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
509
#selected above.  All this is used for is to construct library names.
515
#selected above.  All this is used for is to construct library names.
510
#The make files never examine the actual value.
516
#The make files never examine the actual value.
511
NETPBMLIBSUFFIX = so
517
#NETPBMLIBSUFFIX = so
518
519
NETPBMLIBSUFFIX = dylib
512
520
513
# "a" is the suffix for unix-style static libraries.  It is also
521
# "a" is the suffix for unix-style static libraries.  It is also
514
# traditionally used for shared libraries on AIX.  The Visual Age C
522
# traditionally used for shared libraries on AIX.  The Visual Age C
Lines 531-538 Link Here
531
#and installed in addition to whatever library type you specified by
539
#and installed in addition to whatever library type you specified by
532
#NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
540
#NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
533
#STATICLIB_TOO simply has no effect.
541
#STATICLIB_TOO simply has no effect.
534
STATICLIB_TOO = y
542
#STATICLIB_TOO = y
535
#STATICLIB_TOO = n
543
STATICLIB_TOO = n
536
544
537
#STATICLIBSUFFIX is the suffix that static libraries have.  It's
545
#STATICLIBSUFFIX is the suffix that static libraries have.  It's
538
#meaningless if you aren't building static libraries.
546
#meaningless if you aren't building static libraries.

Return to bug 74101