Tue Feb 7 22:11:40 2012 UTC ()
Make sure to pass CFLAGS=-m64 on SunOS when ABI=64, so that the resulting
libtool script contains proper 64bit flavors of the stdlib objects. Fixes
problem on SunOS when linking C++ objects. Bump PKGREVISION.


(fhajny)
diff -r1.95 -r1.96 pkgsrc/devel/libtool-base/Makefile
cvs diff -r1.95 -r1.96 pkgsrc/devel/libtool-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libtool-base/Makefile 2011/05/14 16:49:45 1.95
+++ pkgsrc/devel/libtool-base/Makefile 2012/02/07 22:11:40 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.95 2011/05/14 16:49:45 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.96 2012/02/07 22:11:40 fhajny Exp $
2 2
3########################################################################### 3###########################################################################
4########################################################################### 4###########################################################################
5# 5#
6# HEADS UP! DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS: 6# HEADS UP! DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
7# 7#
8########################################################################### 8###########################################################################
9########################################################################### 9###########################################################################
10# 10#
11# This package is maintained specially in order to preserve pkgsrc 11# This package is maintained specially in order to preserve pkgsrc
12# specific OS changes that diverge from the "out of the box" libtool. 12# specific OS changes that diverge from the "out of the box" libtool.
13# In order to keep this package in a maintainable condition, the .m4 files 13# In order to keep this package in a maintainable condition, the .m4 files
14# must be manipulated in order to generate the patch-* files. 14# must be manipulated in order to generate the patch-* files.
@@ -16,27 +16,27 @@ @@ -16,27 +16,27 @@
16# See devel/libtool/patches/manual.README for instructions on how to make 16# See devel/libtool/patches/manual.README for instructions on how to make
17# these patch files properly; otherwise your changes WILL be lost on the 17# these patch files properly; otherwise your changes WILL be lost on the
18# next libtool update. 18# next libtool update.
19# 19#
20# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE 20# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
21# INSTRUCTIONS. There are no exceptions to this rule. 21# INSTRUCTIONS. There are no exceptions to this rule.
22# 22#
23########################################################################### 23###########################################################################
24########################################################################### 24###########################################################################
25 25
26.include "../../devel/libtool/Makefile.common" 26.include "../../devel/libtool/Makefile.common"
27 27
28PKGNAME= ${DISTNAME:S/-/-base-/} 28PKGNAME= ${DISTNAME:S/-/-base-/}
29PKGREVISION= 5 29PKGREVISION= 6
30SVR4_PKGNAME= ltoob 30SVR4_PKGNAME= ltoob
31 31
32COMMENT= Generic shared library support script (the script itself) 32COMMENT= Generic shared library support script (the script itself)
33 33
34CONFLICTS+= libtool<=1.3.5nb11 34CONFLICTS+= libtool<=1.3.5nb11
35 35
36TEST_TARGET= check 36TEST_TARGET= check
37PLIST_VARS+= shlibtool 37PLIST_VARS+= shlibtool
38 38
39OVERRIDE_DIRDEPTH.install-sh= 1 39OVERRIDE_DIRDEPTH.install-sh= 1
40 40
41.if ${OPSYS} == "AIX" 41.if ${OPSYS} == "AIX"
42 42
@@ -47,26 +47,31 @@ LDFLAGS+= -Wl,-brtl @@ -47,26 +47,31 @@ LDFLAGS+= -Wl,-brtl
47CONFIGURE_ARGS+= --disable-libtool-lock 47CONFIGURE_ARGS+= --disable-libtool-lock
48 48
49.elif ${OPSYS} == "IRIX" 49.elif ${OPSYS} == "IRIX"
50 50
51# The MIPSpro compiler doesn't support -c with -o, but the locking 51# The MIPSpro compiler doesn't support -c with -o, but the locking
52# workaround is itself broken. Disable it unconditionally. 52# workaround is itself broken. Disable it unconditionally.
53CONFIGURE_ARGS+= --disable-libtool-lock 53CONFIGURE_ARGS+= --disable-libtool-lock
54 54
55.elif ${OPSYS} == "NetBSD" 55.elif ${OPSYS} == "NetBSD"
56. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) 56. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
57CONFIGURE_ARGS+= --disable-shared 57CONFIGURE_ARGS+= --disable-shared
58BUILD_SHLIBTOOL= NO 58BUILD_SHLIBTOOL= NO
59. endif 59. endif
 60
 61.elif ${OPSYS} == "SunOS"
 62. if !empty(ABI:M64)
 63CFLAGS+= -m64
 64. endif
60.endif 65.endif
61 66
62BUILD_SHLIBTOOL?= YES 67BUILD_SHLIBTOOL?= YES
63 68
64# We are going to want libtool to find the same versions of the C, C++, 69# We are going to want libtool to find the same versions of the C, C++,
65# and Fortran compilers. 70# and Fortran compilers.
66# 71#
67USE_LANGUAGES= c c++ fortran77 72USE_LANGUAGES= c c++ fortran77
68CONFIGURE_ARGS+= --disable-ltdl-install 73CONFIGURE_ARGS+= --disable-ltdl-install
69 74
70USE_TOOLS+= echo 75USE_TOOLS+= echo
71 76
72.PHONY: fix-libtool 77.PHONY: fix-libtool