diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-07-08 14:57:06 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-07-08 14:57:06 +0000 |
commit | 8b2b5fecc8c7ffcb526284d303aec82bfb604f94 (patch) | |
tree | 6cdd9afd1e856d83e0a997f23021ff162c79b73f /textproc | |
parent | 86753940cd6f02ed73097ec8c87fd753aa426a58 (diff) | |
download | pkgsrc-8b2b5fecc8c7ffcb526284d303aec82bfb604f94.tar.gz |
Switch to using libtool to build the shared library. The bsd.lib.mk
infrastructure appears to use some constructs which are not currently
available in bootstrap-mk-files.
Bump PKGREVISION and add BUILDLINK_ABI_DEPENDS on the new revision, as
we cannot guarantee that the shared library name didn't change.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/tinyxml/Makefile | 26 | ||||
-rw-r--r-- | textproc/tinyxml/PLIST | 7 | ||||
-rw-r--r-- | textproc/tinyxml/buildlink3.mk | 3 | ||||
-rw-r--r-- | textproc/tinyxml/files/Makefile | 16 |
4 files changed, 23 insertions, 29 deletions
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile index b56cfe0d8bb..a8780495794 100644 --- a/textproc/tinyxml/Makefile +++ b/textproc/tinyxml/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2014/02/16 23:16:05 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/08 14:57:06 jperkin Exp $ DISTNAME= tinyxml_2_6_2 PKGNAME= tinyxml-2.6.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc devel lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyxml/} EXTRACT_SUFX= .zip @@ -13,14 +13,26 @@ COMMENT= Simple, small, C++ XML parser LICENSE= zlib USE_LANGUAGES+= c++ +USE_LIBTOOL= yes + WRKSRC= ${WRKDIR}/${PKGBASE} -MAKE_ENV+= SHLIB_MAJOR=2 SHLIB_MINOR=6 SHLIB_TEENY=2 -MAKE_ENV+= ${BSD_MAKE_ENV} -INSTALL_TARGET= install includes INSTALLATION_DIRS+= include lib -post-extract: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile +CXXFLAGS+= -DTIXML_USE_STL=1 + +do-build: + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinystr.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxml.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlerror.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlparser.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} xmltest.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=link ${LINK.cc} \ + -o libtinyxml.la *.lo -version-info 2:6:2 -rpath ${PREFIX}/lib + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libtinyxml.la \ + ${DESTDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/tinyxml.h ${DESTDIR}${PREFIX}/include/ .include "../../mk/bsd.pkg.mk" diff --git a/textproc/tinyxml/PLIST b/textproc/tinyxml/PLIST index 0b69e2e22b4..b9381cd2995 100644 --- a/textproc/tinyxml/PLIST +++ b/textproc/tinyxml/PLIST @@ -1,6 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1 2014/02/16 23:05:33 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/07/08 14:57:06 jperkin Exp $ include/tinyxml.h -lib/libtinyxml.a -lib/libtinyxml.so -lib/libtinyxml.so.2 -lib/libtinyxml.so.${PKGVERSION} +lib/libtinyxml.la diff --git a/textproc/tinyxml/buildlink3.mk b/textproc/tinyxml/buildlink3.mk index 5acdb96c532..0a2853b1f43 100644 --- a/textproc/tinyxml/buildlink3.mk +++ b/textproc/tinyxml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/02/16 23:05:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2014/07/08 14:57:06 jperkin Exp $ BUILDLINK_TREE+= tinyxml @@ -6,6 +6,7 @@ BUILDLINK_TREE+= tinyxml TINYXML_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2 +BUILDLINK_ABI_DEPENDS.tinyxml?= tinyxml>=2.6.2nb2 BUILDLINK_PKGSRCDIR.tinyxml?= ../../textproc/tinyxml .endif # TINYXML_BUILDLINK3_MK diff --git a/textproc/tinyxml/files/Makefile b/textproc/tinyxml/files/Makefile deleted file mode 100644 index b5af66aa482..00000000000 --- a/textproc/tinyxml/files/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2014/02/16 23:05:33 wiz Exp $ -# -LIBISCXX=yes -MKSTATICLIB=yes -MKDEBUGLIB=no -MKPICINSTALL=no -MKPROFILE=no - -LIB = tinyxml -SRCS= tinystr.cpp tinyxmlerror.cpp tinyxml.cpp tinyxmlparser.cpp -INCS= tinyxml.h - -LIBDIR= ${PREFIX}/lib -INCSDIR= ${PREFIX}/include - -.include <bsd.lib.mk> |