diff options
author | joerg <joerg> | 2015-02-23 18:21:09 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-02-23 18:21:09 +0000 |
commit | f068777e5043fa61bfce55e03818d577c20e8564 (patch) | |
tree | d6a6f527b373268c2bf5631d5f3a68acbfbe76f9 /devel | |
parent | 2e17246b4d5bf02d4b48f8abf41bf19af71670de (diff) | |
download | pkgsrc-f068777e5043fa61bfce55e03818d577c20e8564.tar.gz |
Consistently use our CFLAGS. Fix build with Clang.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gentle/Makefile | 15 | ||||
-rw-r--r-- | devel/gentle/distinfo | 6 | ||||
-rw-r--r-- | devel/gentle/patches/patch-ab | 12 | ||||
-rw-r--r-- | devel/gentle/patches/patch-gentle_build | 14 | ||||
-rw-r--r-- | devel/gentle/patches/patch-reflex_build | 10 |
5 files changed, 44 insertions, 13 deletions
diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile index 19f16bacbf2..51949ba4511 100644 --- a/devel/gentle/Makefile +++ b/devel/gentle/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2015/01/04 02:19:37 dholland Exp $ +# $NetBSD: Makefile,v 1.13 2015/02/23 18:21:09 joerg Exp $ # DISTNAME= gentle-97 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= http://gentle.compilertools.net/ @@ -15,10 +15,15 @@ BROKEN_ON_PLATFORM= ${LP64PLATFORMS} USE_LIBTOOL= yes INSTALLATION_DIRS= bin lib share/doc/gentle/html share/examples/gentle +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -Wno-error=return-type +.endif + do-build: - (cd ${WRKSRC}/gentle && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build) - (cd ${WRKSRC}/lib && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build) - (cd ${WRKSRC}/reflex && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} ./build) + (cd ${WRKSRC}/gentle && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) + (cd ${WRKSRC}/lib && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) + (cd ${WRKSRC}/reflex && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gentle/gentle ${DESTDIR}${PREFIX}/bin diff --git a/devel/gentle/distinfo b/devel/gentle/distinfo index 10710ea71d0..0278cf00dc2 100644 --- a/devel/gentle/distinfo +++ b/devel/gentle/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2012/12/21 01:16:50 dholland Exp $ +$NetBSD: distinfo,v 1.5 2015/02/23 18:21:09 joerg 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) = fa4f9d9206aceea30bda0c9a050c2b4ea40f9678 +SHA1 (patch-ab) = a97340016a76e2e5a90aca7f2c1b644125ac9af5 SHA1 (patch-ba) = 2189027d7dd50604623d8b741de96a6920542efc SHA1 (patch-bb) = c0fe7c3f4171904848043ea7ec62c8e2c87b4197 SHA1 (patch-bc) = 0281d99d868c6e55eca3357819bd4f8d41297fd3 @@ -14,3 +14,5 @@ SHA1 (patch-bf) = 6517ef2f65a802fff764965dc3a50bf5ce34fb2c SHA1 (patch-bg) = 46ad7192e8a766f8d98d1588a0e72873586bb82a SHA1 (patch-bh) = d6f4b4f6a5c3c8a5d90ae3515209598e851ec0ed SHA1 (patch-bi) = 7ae860cb89585fcb6223beee5bd6e7def405f69e +SHA1 (patch-gentle_build) = 17134abe5b892f649ebc7dd9a7b46f3eff9b6896 +SHA1 (patch-reflex_build) = d473baf5f91d762457826e7f4d297d6b95750f87 diff --git a/devel/gentle/patches/patch-ab b/devel/gentle/patches/patch-ab index 48b6e8664f9..f95c649173e 100644 --- a/devel/gentle/patches/patch-ab +++ b/devel/gentle/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2012/12/21 01:16:51 dholland Exp $ +$NetBSD: patch-ab,v 1.3 2015/02/23 18:21:09 joerg Exp $ - use libtool - honor pkgsrc's CC @@ -17,10 +17,10 @@ $NetBSD: patch-ab,v 1.2 2012/12/21 01:16:51 dholland Exp $ -$CC -c strings.c -$CC -c idents.c -$CC -c output.c -+${LIBTOOL} --mode=compile $CC -c main.c -+${LIBTOOL} --mode=compile $CC -c errmsg.c -+${LIBTOOL} --mode=compile $CC -c strings.c -+${LIBTOOL} --mode=compile $CC -c idents.c -+${LIBTOOL} --mode=compile $CC -c output.c ++${LIBTOOL} --mode=compile $CC $CFLAGS -c main.c ++${LIBTOOL} --mode=compile $CC $CFLAGS -c errmsg.c ++${LIBTOOL} --mode=compile $CC $CFLAGS -c strings.c ++${LIBTOOL} --mode=compile $CC $CFLAGS -c idents.c ++${LIBTOOL} --mode=compile $CC $CFLAGS -c output.c + +${LIBTOOL} --mode=link ${CC} -o libgentle.la main.lo errmsg.lo strings.lo idents.lo output.lo -rpath ${PREFIX}/lib -version-info 0:0:0 diff --git a/devel/gentle/patches/patch-gentle_build b/devel/gentle/patches/patch-gentle_build new file mode 100644 index 00000000000..9b0d9873010 --- /dev/null +++ b/devel/gentle/patches/patch-gentle_build @@ -0,0 +1,14 @@ +$NetBSD: patch-gentle_build,v 1.1 2015/02/23 18:21:09 joerg Exp $ + +--- gentle/build.orig 2015-02-22 19:37:35.000000000 +0000 ++++ gentle/build +@@ -3,9 +3,6 @@ + set -e + set -x + +-CC=cc +-CFLAGS= +- + $CC $CFLAGS -c cyfront.c + $CC $CFLAGS -c main.c + $CC $CFLAGS -c input.c diff --git a/devel/gentle/patches/patch-reflex_build b/devel/gentle/patches/patch-reflex_build new file mode 100644 index 00000000000..48fdd20cc27 --- /dev/null +++ b/devel/gentle/patches/patch-reflex_build @@ -0,0 +1,10 @@ +$NetBSD: patch-reflex_build,v 1.1 2015/02/23 18:21:09 joerg Exp $ + +--- reflex/build.orig 2015-02-22 19:40:06.000000000 +0000 ++++ reflex/build +@@ -3,4 +3,4 @@ + set -e + set -x + +-cc reflex.c -o reflex ++$CC $CFLAGS reflex.c -o reflex |