diff options
| author | dholland <dholland@pkgsrc.org> | 2012-12-21 01:16:50 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-12-21 01:16:50 +0000 |
| commit | 53322cd76f5e9fe5c7fee65364905df723ce1f0a (patch) | |
| tree | 9194cec869b14c19e4d02d1e38124e5b35cb0edb | |
| parent | d0de73d75620e2b0b5073bb5242dd42cd299a73c (diff) | |
| download | pkgsrc-53322cd76f5e9fe5c7fee65364905df723ce1f0a.tar.gz | |
Fix "libtool: unable to infer tagged configuration" breakage.
| -rw-r--r-- | devel/gentle/Makefile | 8 | ||||
| -rw-r--r-- | devel/gentle/distinfo | 4 | ||||
| -rw-r--r-- | devel/gentle/patches/patch-ab | 14 |
3 files changed, 16 insertions, 10 deletions
diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile index c8e155d8faf..84c9e1f93e1 100644 --- a/devel/gentle/Makefile +++ b/devel/gentle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/31 11:16:59 asau Exp $ +# $NetBSD: Makefile,v 1.10 2012/12/21 01:16:50 dholland Exp $ # DISTNAME= gentle-97 @@ -16,9 +16,9 @@ USE_LIBTOOL= yes INSTALLATION_DIRS= bin lib do-build: - (cd ${WRKSRC}/gentle ; LIBTOOL=${LOCALBASE}/bin/libtool ./build) - (cd ${WRKSRC}/lib ; LIBTOOL=${LOCALBASE}/bin/libtool ./build) - (cd ${WRKSRC}/reflex ; LIBTOOL=${LOCALBASE}/bin/libtool ./build) + (cd ${WRKSRC}/gentle ; LIBTOOL=${LIBTOOL} CC=${CC} ./build) + (cd ${WRKSRC}/lib ; LIBTOOL=${LIBTOOL} CC=${CC} ./build) + (cd ${WRKSRC}/reflex ; LIBTOOL=${LIBTOOL} CC=${CC} ./build) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gentle/gentle ${DESTDIR}${PREFIX}/bin diff --git a/devel/gentle/distinfo b/devel/gentle/distinfo index 8c5247b742b..10710ea71d0 100644 --- a/devel/gentle/distinfo +++ b/devel/gentle/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2009/11/30 00:03:08 dholland Exp $ +$NetBSD: distinfo,v 1.4 2012/12/21 01:16:50 dholland Exp $ SHA1 (gentle-97.tar.gz) = 1cbf70aa6c470346630c407f89878a5f3c0c4406 RMD160 (gentle-97.tar.gz) = 96cbfca6909f23fa192514eaba0f0fffcfac2d40 Size (gentle-97.tar.gz) = 453860 bytes SHA1 (patch-aa) = 4b76e24c516ea96214e749758ff4093c0f464ecc -SHA1 (patch-ab) = aea90f9fb1c4fbb00d8595bc5f345d816c023e1a +SHA1 (patch-ab) = fa4f9d9206aceea30bda0c9a050c2b4ea40f9678 SHA1 (patch-ba) = 2189027d7dd50604623d8b741de96a6920542efc SHA1 (patch-bb) = c0fe7c3f4171904848043ea7ec62c8e2c87b4197 SHA1 (patch-bc) = 0281d99d868c6e55eca3357819bd4f8d41297fd3 diff --git a/devel/gentle/patches/patch-ab b/devel/gentle/patches/patch-ab index c5ea8ababe7..48b6e8664f9 100644 --- a/devel/gentle/patches/patch-ab +++ b/devel/gentle/patches/patch-ab @@ -1,10 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/11/30 08:23:15 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2012/12/21 01:16:51 dholland Exp $ ---- lib/build.orig 1998-08-21 01:56:12.000000000 +1200 +- use libtool +- honor pkgsrc's CC + +--- lib/build.orig 1998-08-20 13:56:12.000000000 +0000 +++ lib/build -@@ -7,8 +7,10 @@ GENTLE=../gentle/gentle +@@ -5,10 +5,12 @@ set -x + + GENTLE=../gentle/gentle GRTS=../gentle/grts.o - CC=cc +-CC=cc ++#CC=cc -$CC -c main.c -$CC -c errmsg.c |