Sat May 10 13:35:59 2014 UTC ()
revbump libtool-base after libtool patches


(richard)
diff -r1.106 -r1.107 pkgsrc/devel/libtool-base/Makefile
cvs diff -r1.106 -r1.107 pkgsrc/devel/libtool-base/Makefile (switch to unified diff)

--- pkgsrc/devel/libtool-base/Makefile 2014/03/08 19:57:26 1.106
+++ pkgsrc/devel/libtool-base/Makefile 2014/05/10 13:35:59 1.107
@@ -1,90 +1,90 @@ @@ -1,90 +1,90 @@
1# $NetBSD: Makefile,v 1.106 2014/03/08 19:57:26 joerg Exp $ 1# $NetBSD: Makefile,v 1.107 2014/05/10 13:35:59 richard 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.
15# 15#
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= 6 29PKGREVISION= 7
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
37 37
38OVERRIDE_DIRDEPTH.install-sh= 1 38OVERRIDE_DIRDEPTH.install-sh= 1
39 39
40.if ${OPSYS} == "AIX" 40.if ${OPSYS} == "AIX"
41 41
42# always build libraries and executables that use the runtime linker. 42# always build libraries and executables that use the runtime linker.
43# in addition, disable libtool locking, as the test is broken on AIX, 43# in addition, disable libtool locking, as the test is broken on AIX,
44# and results in files being locked indefinitely. 44# and results in files being locked indefinitely.
45LDFLAGS+= -Wl,-brtl 45LDFLAGS+= -Wl,-brtl
46CONFIGURE_ARGS+= --disable-libtool-lock 46CONFIGURE_ARGS+= --disable-libtool-lock
47 47
48.elif ${OPSYS} == "IRIX" 48.elif ${OPSYS} == "IRIX"
49 49
50# The MIPSpro compiler doesn't support -c with -o, but the locking 50# The MIPSpro compiler doesn't support -c with -o, but the locking
51# workaround is itself broken. Disable it unconditionally. 51# workaround is itself broken. Disable it unconditionally.
52CONFIGURE_ARGS+= --disable-libtool-lock 52CONFIGURE_ARGS+= --disable-libtool-lock
53 53
54.elif ${OPSYS} == "SunOS" 54.elif ${OPSYS} == "SunOS"
55CFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} 55CFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}}
56.endif 56.endif
57 57
58# We are going to want libtool to find the same versions of the C, C++, 58# We are going to want libtool to find the same versions of the C, C++,
59# and Fortran compilers. 59# and Fortran compilers.
60# 60#
61USE_LANGUAGES= c c++ 61USE_LANGUAGES= c c++
62CONFIGURE_ARGS+= --disable-ltdl-install 62CONFIGURE_ARGS+= --disable-ltdl-install
63CONFIGURE_ARGS+= F77=no FC=no 63CONFIGURE_ARGS+= F77=no FC=no
64 64
65USE_TOOLS+= echo 65USE_TOOLS+= echo
66 66
67.PHONY: fix-libtool 67.PHONY: fix-libtool
68fix-libtool: 68fix-libtool:
69 cd ${WRKSRC}; for f in libtool; do \ 69 cd ${WRKSRC}; for f in libtool; do \
70 ${SED} -e "s,-L${BUILDLINK_DIR}/lib *,," \ 70 ${SED} -e "s,-L${BUILDLINK_DIR}/lib *,," \
71 -e "s,${BUILDLINK_DIR}/lib *,," \ 71 -e "s,${BUILDLINK_DIR}/lib *,," \
72 $$f > $$f.new; \ 72 $$f > $$f.new; \
73 if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \ 73 if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \
74 ${MV} -f $$f.new $$f; \ 74 ${MV} -f $$f.new $$f; \
75 done 75 done
76 76
77post-build: fix-libtool 77post-build: fix-libtool
78 78
79post-build: 79post-build:
80 @${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \ 80 @${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \
81 -e "s|@SH@|"${SH:Q}"|g" \ 81 -e "s|@SH@|"${SH:Q}"|g" \
82 ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool 82 ${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool
83 83
84post-install: 84post-install:
85 ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/bin/shlibtool 85 ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/bin/shlibtool
86 86
87BUILDLINK_DEPMETHOD.dlcompat= build 87BUILDLINK_DEPMETHOD.dlcompat= build
88 88
89.include "../../mk/dlopen.buildlink3.mk" 89.include "../../mk/dlopen.buildlink3.mk"
90.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"