From dbadce17fa6ea1a684a33a3ccae9c64b72131ba4 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 14 Jul 2000 06:51:16 +0000 Subject: [PATCH] Force GTL to use SGI STL as the egcs-1.1.2 copy of the STL is not sufficient. --- devel/gtl/Makefile | 12 +++++++++++- devel/gtl/files/patch-sum | 3 ++- devel/gtl/patches/patch-ab | 20 ++++++++++++++++++++ devel/gtl/pkg/MESSAGE | 7 +++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 devel/gtl/patches/patch-ab create mode 100644 devel/gtl/pkg/MESSAGE diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile index a39c11985c9a..e61efde76460 100644 --- a/devel/gtl/Makefile +++ b/devel/gtl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/07/13 15:10:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/14 06:51:16 jlam Exp $ DISTNAME= GTL-0.3.3 PKGNAME= gtl-0.3.3 @@ -8,15 +8,25 @@ MASTER_SITES= http://infosun.fmi.uni-passau.de/GTL/archive/ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.fmi.uni-passau.de/Graphlet/GTL/ +DEPENDS+= sgi-stl-*:../../devel/sgi-stl + GNU_CONFIGURE= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include/sgi-stl + GTL_VERS= 0:3 MAKE_ENV+= GTL_VERS="${GTL_VERS}" +MESSAGE_FILE= ${WRKDIR}/MESSAGE HTMLDOCDIR= ${PREFIX}/share/doc/html/GTL +post-build: + ${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" \ + < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} + post-install: ${INSTALL_DATA_DIR} ${HTMLDOCDIR} ${INSTALL_DATA_DIR} ${HTMLDOCDIR}/icons diff --git a/devel/gtl/files/patch-sum b/devel/gtl/files/patch-sum index 79f158c5609b..d1c5ca9f75f7 100644 --- a/devel/gtl/files/patch-sum +++ b/devel/gtl/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.2 2000/07/13 15:10:35 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/07/14 06:51:17 jlam Exp $ MD5 (patch-aa) = b6148b3262c241c822309b01f4487652 +MD5 (patch-ab) = 5c99810271dec62ff29901de21823046 diff --git a/devel/gtl/patches/patch-ab b/devel/gtl/patches/patch-ab new file mode 100644 index 000000000000..be73e10fa2a5 --- /dev/null +++ b/devel/gtl/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.1 2000/07/14 06:51:17 jlam Exp $ + +--- include/GTL/GTL.h.orig Thu Feb 3 07:50:16 2000 ++++ include/GTL/GTL.h Thu Jul 13 11:56:17 2000 +@@ -128,6 +128,7 @@ + // Bugfix for EGCS & GCC < 2.95 + //-------------------------------------------------------------------------- + ++#if 0 + #if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 95 + + #include +@@ -141,6 +142,7 @@ + { + }; + ++#endif + #endif + + //-------------------------------------------------------------------------- diff --git a/devel/gtl/pkg/MESSAGE b/devel/gtl/pkg/MESSAGE new file mode 100644 index 000000000000..4ddcdd73fb53 --- /dev/null +++ b/devel/gtl/pkg/MESSAGE @@ -0,0 +1,7 @@ +========================================================================== +$NetBSD: MESSAGE,v 1.1 2000/07/14 06:51:18 jlam Exp $ + +If your project uses GTL, then you will need to pass +"-I@LOCALBASE@/include/sgi-stl" to the compiler so that it may +find the SGI STL headers. +==========================================================================