diff options
| author | mef <mef> | 2012-12-26 06:50:27 +0000 |
|---|---|---|
| committer | mef <mef> | 2012-12-26 06:50:27 +0000 |
| commit | 6b602fececa58d7cfd8163b207276ae65141e85f (patch) | |
| tree | 0e6d48b56b048bd98a1da1aa80f70b197274e292 /ham | |
| parent | 976cc657af738b17f84edc6eceb3e05b373b7db0 (diff) | |
| download | pkgsrc-6b602fececa58d7cfd8163b207276ae65141e85f.tar.gz | |
Fix for gcc-4.7 (DragonFryBSD 3.3),
getting g++: unrecognized option '-pthread-lrt'.
The original sed script eats space chars around '-lpthread',
This is apparently upstream bug and report are already sent.
OK'ed by gdt@ and thanks marino@,
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/fldigi/distinfo | 4 | ||||
| -rw-r--r-- | ham/fldigi/patches/patch-configure | 19 | ||||
| -rw-r--r-- | ham/fldigi/patches/patch-xmlrpc.m4 | 17 |
3 files changed, 39 insertions, 1 deletions
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index fd22677dca7..b1a2ec64d9b 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.9 2012/11/19 23:23:38 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/12/26 06:50:27 mef Exp $ SHA1 (fldigi-3.21.58.tar.gz) = 8ec7ec70cfcc0591fcfd0e3bcb34f9d5a24cab7a RMD160 (fldigi-3.21.58.tar.gz) = 32f3dd51c99285cc3addf3a402365b4db7af0a5b Size (fldigi-3.21.58.tar.gz) = 1794407 bytes +SHA1 (patch-configure) = 7688007c234124257aae8628d237120182765e1f SHA1 (patch-src_misc_newinstall.cxx) = 9cb519bb0bc862b18cfc7fb7bf85c2259e4ff2f0 SHA1 (patch-src_throb_throb.cxx) = 4515fdfe67aec3273ebe2d9a348f8e13ef596c71 +SHA1 (patch-xmlrpc.m4) = c5fa6105663b534a18f2dc3a4860f76297337bb1 diff --git a/ham/fldigi/patches/patch-configure b/ham/fldigi/patches/patch-configure new file mode 100644 index 00000000000..3e89266d750 --- /dev/null +++ b/ham/fldigi/patches/patch-configure @@ -0,0 +1,19 @@ +$NetBSD: patch-configure,v 1.1 2012/12/26 06:50:28 mef Exp $ + +The original sed script eats space chars around '-lpthread', +getting g++: unrecognized option '-pthread-lrt'. +Thus work arround: + +--- configure.orig 2012-10-21 05:31:25.000000000 +0900 ++++ configure 2012-12-25 20:10:40.816648000 +0900 +@@ -9938,8 +9938,8 @@ + ac_cv_xmlrpc=yes + + test "x$XMLRPC_CFLAGS" = "x" && XMLRPC_CFLAGS=`$XMLRPC_C_CONFIG c++2 abyss-server --cflags` + if test "x$XMLRPC_LIBS" = "x"; then +- XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed s/.-lpthread.//` ++ XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed 's/.-lpthread./ /'` + test "$ac_cv_static" = "yes" && XMLRPC_LIBS="-Wl,-Bstatic $XMLRPC_LIBS -Wl,-Bdynamic" + fi + fi + diff --git a/ham/fldigi/patches/patch-xmlrpc.m4 b/ham/fldigi/patches/patch-xmlrpc.m4 new file mode 100644 index 00000000000..cdaab7d5e38 --- /dev/null +++ b/ham/fldigi/patches/patch-xmlrpc.m4 @@ -0,0 +1,17 @@ +$NetBSD: patch-xmlrpc.m4,v 1.1 2012/12/26 06:50:28 mef Exp $ + +The original sed script eats space chars around '-lpthread', +getting g++: unrecognized option '-pthread-lrt'. +Thus work arround: + +--- m4/xmlrpc.m4.orig 2012-12-25 08:59:11.337607000 +0900 ++++ m4/xmlrpc.m4 2012-12-25 09:20:27.797219000 +0900 +@@ -12,7 +12,7 @@ + + test "x$XMLRPC_CFLAGS" = "x" && XMLRPC_CFLAGS=`$XMLRPC_C_CONFIG c++2 abyss-server --cflags` + if test "x$XMLRPC_LIBS" = "x"; then +- XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed s/.-lpthread.//` ++ XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | sed 's/.-lpthread./ /'` + test "$ac_cv_static" = "yes" && XMLRPC_LIBS="-Wl,-Bstatic $XMLRPC_LIBS -Wl,-Bdynamic" + fi + fi |