Sat Oct 5 07:40:59 2013 UTC ()
Use INSTALL_LIB with 7z.so; fixes 'symbols referenced by indirect symbol table entries that can't be stripped' on Darwin


(adam)
diff -r1.53 -r1.54 pkgsrc/archivers/p7zip/Makefile
cvs diff -r1.53 -r1.54 pkgsrc/archivers/p7zip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/p7zip/Makefile 2013/10/05 06:16:39 1.53
+++ pkgsrc/archivers/p7zip/Makefile 2013/10/05 07:40:59 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.53 2013/10/05 06:16:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2013/10/05 07:40:59 adam Exp $
2 2
3DISTNAME= p7zip_9.20.1_src_all 3DISTNAME= p7zip_9.20.1_src_all
4PKGNAME= p7zip-9.20.1 4PKGNAME= p7zip-9.20.1
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://p7zip.sourceforge.net/ 11HOMEPAGE= http://p7zip.sourceforge.net/
12COMMENT= File archiver with high compression 12COMMENT= File archiver with high compression
13LICENSE= gnu-lgpl-v2.1 AND unrar-license 13LICENSE= gnu-lgpl-v2.1 AND unrar-license
14 14
@@ -50,27 +50,27 @@ SUBST_SED.lib+= -e "s,getenv(.P7ZIP_HOM @@ -50,27 +50,27 @@ SUBST_SED.lib+= -e "s,getenv(.P7ZIP_HOM
50SUBST_STAGE.lib= post-patch 50SUBST_STAGE.lib= post-patch
51 51
52.include "../../mk/endian.mk" 52.include "../../mk/endian.mk"
53 53
54.if !empty(MACHINE_ENDIAN:Mbig) 54.if !empty(MACHINE_ENDIAN:Mbig)
55CFLAGS+= -DBIG_ENDIAN 55CFLAGS+= -DBIG_ENDIAN
56.else 56.else
57CFLAGS+= -DLITTLE_ENDIAN 57CFLAGS+= -DLITTLE_ENDIAN
58.endif 58.endif
59 59
60do-install: 60do-install:
61 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin 61 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
62.if !empty(DYNAMIC_7Z:MYES) 62.if !empty(DYNAMIC_7Z:MYES)
63 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/ 63 ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${DESTDIR}${PREFIX}/lib/
64 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z 64 ${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
65 ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin 65 ln -f -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
66 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \ 66 ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
67 ${DESTDIR}${PREFIX}/lib/7z/Codecs 67 ${DESTDIR}${PREFIX}/lib/7z/Codecs
68.else 68.else
69 ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z 69 ln -f -s 7za ${DESTDIR}${PREFIX}/bin/7z
70.endif 70.endif
71 ${INSTALL_DATA} ${WRKSRC}/README \ 71 ${INSTALL_DATA} ${WRKSRC}/README \
72 ${DESTDIR}${PREFIX}/share/doc/p7zip 72 ${DESTDIR}${PREFIX}/share/doc/p7zip
73 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \ 73 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \
74 ${DESTDIR}${PREFIX}/share/doc/p7zip 74 ${DESTDIR}${PREFIX}/share/doc/p7zip
75 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \ 75 ${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \
76 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands 76 ${DESTDIR}${PREFIX}/share/doc/p7zip/commands