Sun Oct 27 20:33:18 2013 UTC ()
Make the GCC version check specific enough to not match clang.


(joerg)
diff -r1.17 -r1.18 pkgsrc/lang/yap/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/yap/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/lang/yap/patches/patch-configure.in
cvs diff -r1.17 -r1.18 pkgsrc/lang/yap/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/yap/distinfo 2013/07/19 12:51:56 1.17
+++ pkgsrc/lang/yap/distinfo 2013/10/27 20:33:18 1.18
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.17 2013/07/19 12:51:56 joerg Exp $ 1$NetBSD: distinfo,v 1.18 2013/10/27 20:33:18 joerg Exp $
2 2
3SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5 3SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5
4RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808 4RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808
5Size (yap-6.3.3.tar.gz) = 7879301 bytes 5Size (yap-6.3.3.tar.gz) = 7879301 bytes
6SHA1 (patch-aa) = 113f443f57fac208632701fc7eddca18d98d240d 6SHA1 (patch-aa) = 113f443f57fac208632701fc7eddca18d98d240d
7SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10 7SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10
8SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01 8SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01
9SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b 9SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b
10SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648 10SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
11SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7 11SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7
12SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3 12SHA1 (patch-configure) = ceecff9a53b8fbeed0912dc9df397670bcc2d10f
13SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460 13SHA1 (patch-configure.in) = fea4c56c929b3ad51a43294321c3e013254f5634
14SHA1 (patch-packages_CLPBN_horus_HorusCli.cpp) = 82879fa9e998c993a10850bce729e658f73bec11 14SHA1 (patch-packages_CLPBN_horus_HorusCli.cpp) = 82879fa9e998c993a10850bce729e658f73bec11
15SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8 15SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8
16SHA1 (patch-packages_swi-minisat2_C_SolverTypes.h) = 88ee9ab4dd7fc43e3433d02633513c204981ece2 16SHA1 (patch-packages_swi-minisat2_C_SolverTypes.h) = 88ee9ab4dd7fc43e3433d02633513c204981ece2
cvs diff -r1.1 -r1.2 pkgsrc/lang/yap/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/yap/patches/patch-configure 2013/06/13 21:44:06 1.1
+++ pkgsrc/lang/yap/patches/patch-configure 2013/10/27 20:33:18 1.2
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-configure,v 1.1 2013/06/13 21:44:06 joerg Exp $ 1$NetBSD: patch-configure,v 1.2 2013/10/27 20:33:18 joerg Exp $
2 2
3--- configure.orig 2013-06-13 17:40:09.000000000 +0000 3--- configure.orig 2013-01-19 11:48:08.000000000 +0000
4+++ configure 4+++ configure
 5@@ -5169,7 +5169,7 @@ then
 6 C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
 7 CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
 8 case "`$CC --version < /dev/null`" in
 9- *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
 10+ *gcc*3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
 11 esac
 12 case "$target_cpu" in
 13 i*86*)
5@@ -8099,8 +8099,8 @@ fi 14@@ -8099,8 +8099,8 @@ fi
6 if test "$have_dl" = "yes" 15 if test "$have_dl" = "yes"
7 then 16 then
8 SO="so" 17 SO="so"
9- SHLIB_LD="$CC -shared -export-dynamic" 18- SHLIB_LD="$CC -shared -export-dynamic"
10- SHLIB_CXX_LD="$CXX -shared -export-dynamic" 19- SHLIB_CXX_LD="$CXX -shared -export-dynamic"
11+ SHLIB_LD="$CC -shared -Wl,-export-dynamic" 20+ SHLIB_LD="$CC -shared -Wl,-export-dynamic"
12+ SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic" 21+ SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"
13 DO_SECOND_LD="" 22 DO_SECOND_LD=""
14 LIBS="$LIBS -ldl" 23 LIBS="$LIBS -ldl"
15 case "$target_cpu" in 24 case "$target_cpu" in
16@@ -8170,8 +8170,8 @@ fi 25@@ -8170,8 +8170,8 @@ fi
17 then 26 then
cvs diff -r1.1 -r1.2 pkgsrc/lang/yap/patches/patch-configure.in (expand / switch to unified diff)

--- pkgsrc/lang/yap/patches/patch-configure.in 2013/06/13 21:44:06 1.1
+++ pkgsrc/lang/yap/patches/patch-configure.in 2013/10/27 20:33:18 1.2
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-configure.in,v 1.1 2013/06/13 21:44:06 joerg Exp $ 1$NetBSD: patch-configure.in,v 1.2 2013/10/27 20:33:18 joerg Exp $
2 2
3--- configure.in.orig 2013-06-13 17:40:11.000000000 +0000 3--- configure.in.orig 2013-01-19 11:44:05.000000000 +0000
4+++ configure.in 4+++ configure.in
 5@@ -595,7 +595,7 @@ then
 6 C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
 7 CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
 8 case "`$CC --version < /dev/null`" in
 9- *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
 10+ *gcc*3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
 11 esac
 12 case "$target_cpu" in
 13 i*86*)
5@@ -1193,8 +1193,8 @@ case "$target_os" in  14@@ -1193,8 +1193,8 @@ case "$target_os" in
6 if test "$have_dl" = "yes"  15 if test "$have_dl" = "yes"
7 then  16 then
8 SO="so"  17 SO="so"
9- SHLIB_LD="$CC -shared -export-dynamic"  18- SHLIB_LD="$CC -shared -export-dynamic"
10- SHLIB_CXX_LD="$CXX -shared -export-dynamic"  19- SHLIB_CXX_LD="$CXX -shared -export-dynamic"
11+ SHLIB_LD="$CC -shared -Wl,-export-dynamic"  20+ SHLIB_LD="$CC -shared -Wl,-export-dynamic"
12+ SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"  21+ SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"
13 DO_SECOND_LD=""  22 DO_SECOND_LD=""
14 LIBS="$LIBS -ldl"  23 LIBS="$LIBS -ldl"
15 case "$target_cpu" in  24 case "$target_cpu" in
16@@ -1263,8 +1263,8 @@ case "$target_os" in  25@@ -1263,8 +1263,8 @@ case "$target_os" in
17 then  26 then