summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-12-19 13:34:53 +0000
committerjoerg <joerg@pkgsrc.org>2016-12-19 13:34:53 +0000
commit0e44244f578a7303fe74fc946e8012c7d3e72e40 (patch)
tree2ed3b80ddae0e2aad211b3e26bee7630bb0a84a5
parentde7a17f70404258b1b973c9b8b40f54fa24ecf38 (diff)
downloadpkgsrc-0e44244f578a7303fe74fc946e8012c7d3e72e40.tar.gz
When building with clang, ignore return type warnings.
-rw-r--r--lang/cint/Makefile7
-rw-r--r--lang/cint/distinfo3
-rw-r--r--lang/cint/patches/patch-readline_Makefile.base13
3 files changed, 21 insertions, 2 deletions
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index d7962abbe0c..f285126675d 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/09/28 10:00:27 kamil Exp $
+# $NetBSD: Makefile,v 1.33 2016/12/19 13:34:53 joerg Exp $
DISTNAME= cint-5.16.19-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -37,6 +37,11 @@ BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/cint/lib
BUILD_TARGET= # empty string required (override "all")
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV+= CFLAGS_NO_RETURN_TYPE=-Wno-error=return-type
+.endif
+
INSTALLATION_DIRS+= bin cint cint/lib share/doc/cint
INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3
diff --git a/lang/cint/distinfo b/lang/cint/distinfo
index 207ac9d5513..17fb945d605 100644
--- a/lang/cint/distinfo
+++ b/lang/cint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/09/28 10:00:27 kamil Exp $
+$NetBSD: distinfo,v 1.11 2016/12/19 13:34:53 joerg Exp $
SHA1 (cint-5.16.19-source.tar.gz) = 22307e50b4414f4e6e70d791d3ccfe2cc2163f59
RMD160 (cint-5.16.19-source.tar.gz) = ff7deb0cdf5534fb8849eaf5febf9e57117066ff
@@ -21,3 +21,4 @@ SHA1 (patch-tool_ifdef_Makefile.base) = dfc90a0ea0a7fb87a49ad057b928d39c67aec410
SHA1 (patch-tool_ifdef_get.c) = 6719537bd515260095a7d15a2e870df3ccd244eb
SHA1 (patch-tool_ifdef_ifdef.cxx) = 62770d0fb6556ac2efc16f692c15c6acc38174ab
SHA1 (patch-tool_makecint.cxx) = b81d05e92dd089ad7a4d85160266fa3d19a1dab4
+SHA1 (patch-readline_Makefile.base) = ac6656bdcd92ccb38f8ec200fb8780cdb2dc0000
diff --git a/lang/cint/patches/patch-readline_Makefile.base b/lang/cint/patches/patch-readline_Makefile.base
new file mode 100644
index 00000000000..3b56ee66398
--- /dev/null
+++ b/lang/cint/patches/patch-readline_Makefile.base
@@ -0,0 +1,13 @@
+$NetBSD: patch-readline_Makefile.base,v 1.1 2016/12/19 13:34:53 joerg Exp $
+
+--- readline/Makefile.base.orig 2015-09-21 17:55:28.000000000 +0000
++++ readline/Makefile.base
+@@ -46,7 +46,7 @@ READLINE_DEFINES = $(TYPES) -DVI_MODE
+ # DEBUG_FLAGS = -O
+ DEBUG_FLAGS = $(OPTIMIZE)
+ LDFLAGS = $(DEBUG_FLAGS)
+-CFLAGS = $(DEBUG_FLAGS) $(USG) -I.
++CFLAGS = $(DEBUG_FLAGS) $(USG) -I. ${CFLAGS_NO_RETURN_TYPE}
+
+ # A good alternative is gcc -traditional.
+ #CC = gcc -traditional