diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-27 20:33:18 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-27 20:33:18 +0000 |
commit | 2d83feaf47f17bbfec80301bd61f2043d6afe133 (patch) | |
tree | aead5d908ea224ca77a05174730ef4f2c64201d0 /lang | |
parent | 43c2fac6d6e9ee52eeff5c0c92dae1f809bca913 (diff) | |
download | pkgsrc-2d83feaf47f17bbfec80301bd61f2043d6afe133.tar.gz |
Make the GCC version check specific enough to not match clang.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/yap/distinfo | 6 | ||||
-rw-r--r-- | lang/yap/patches/patch-configure | 13 | ||||
-rw-r--r-- | lang/yap/patches/patch-configure.in | 13 |
3 files changed, 25 insertions, 7 deletions
diff --git a/lang/yap/distinfo b/lang/yap/distinfo index 72328de5a15..fb1f89b5e14 100644 --- a/lang/yap/distinfo +++ b/lang/yap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2013/07/19 12:51:56 joerg Exp $ +$NetBSD: distinfo,v 1.18 2013/10/27 20:33:18 joerg Exp $ SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5 RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808 @@ -9,8 +9,8 @@ SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01 SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648 SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7 -SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3 -SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460 +SHA1 (patch-configure) = ceecff9a53b8fbeed0912dc9df397670bcc2d10f +SHA1 (patch-configure.in) = fea4c56c929b3ad51a43294321c3e013254f5634 SHA1 (patch-packages_CLPBN_horus_HorusCli.cpp) = 82879fa9e998c993a10850bce729e658f73bec11 SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8 SHA1 (patch-packages_swi-minisat2_C_SolverTypes.h) = 88ee9ab4dd7fc43e3433d02633513c204981ece2 diff --git a/lang/yap/patches/patch-configure b/lang/yap/patches/patch-configure index 663718a276c..c8a368f409a 100644 --- a/lang/yap/patches/patch-configure +++ b/lang/yap/patches/patch-configure @@ -1,7 +1,16 @@ -$NetBSD: patch-configure,v 1.1 2013/06/13 21:44:06 joerg Exp $ +$NetBSD: patch-configure,v 1.2 2013/10/27 20:33:18 joerg Exp $ ---- configure.orig 2013-06-13 17:40:09.000000000 +0000 +--- configure.orig 2013-01-19 11:48:08.000000000 +0000 +++ configure +@@ -5169,7 +5169,7 @@ then + C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS" + CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS" + case "`$CC --version < /dev/null`" in +- *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; ++ *gcc*3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; + esac + case "$target_cpu" in + i*86*) @@ -8099,8 +8099,8 @@ fi if test "$have_dl" = "yes" then diff --git a/lang/yap/patches/patch-configure.in b/lang/yap/patches/patch-configure.in index 2017a630b74..dd167bc3421 100644 --- a/lang/yap/patches/patch-configure.in +++ b/lang/yap/patches/patch-configure.in @@ -1,7 +1,16 @@ -$NetBSD: patch-configure.in,v 1.1 2013/06/13 21:44:06 joerg Exp $ +$NetBSD: patch-configure.in,v 1.2 2013/10/27 20:33:18 joerg Exp $ ---- configure.in.orig 2013-06-13 17:40:11.000000000 +0000 +--- configure.in.orig 2013-01-19 11:44:05.000000000 +0000 +++ configure.in +@@ -595,7 +595,7 @@ then
+ C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
+ CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
+ case "`$CC --version < /dev/null`" in
+- *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
++ *gcc*3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
+ esac
+ case "$target_cpu" in
+ i*86*)
@@ -1193,8 +1193,8 @@ case "$target_os" in
if test "$have_dl" = "yes"
then
|