diff options
| author | joerg <joerg@pkgsrc.org> | 2013-10-04 18:35:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-10-04 18:35:22 +0000 |
| commit | c93e6118aff94604ecfb6d2cdf1054d558137fb8 (patch) | |
| tree | 5128fe80e5beea4395a6f0c2ef69e13b30c363eb /lang/guile16 | |
| parent | 6c3e0793cf9bfa36a58f3d16c825e20724ca8813 (diff) | |
| download | pkgsrc-c93e6118aff94604ecfb6d2cdf1054d558137fb8.tar.gz | |
Improve robustness of the C post-processing to deal with variations in
Clang output.
Diffstat (limited to 'lang/guile16')
| -rw-r--r-- | lang/guile16/distinfo | 4 | ||||
| -rw-r--r-- | lang/guile16/patches/patch-libguile_guile-snarf-docs.in | 11 | ||||
| -rw-r--r-- | lang/guile16/patches/patch-libguile_guile-snarf.in | 14 |
3 files changed, 28 insertions, 1 deletions
diff --git a/lang/guile16/distinfo b/lang/guile16/distinfo index 28e749129a7..c8002a8cd94 100644 --- a/lang/guile16/distinfo +++ b/lang/guile16/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2013/04/21 15:35:24 joerg Exp $ +$NetBSD: distinfo,v 1.5 2013/10/04 18:35:22 joerg Exp $ SHA1 (guile-1.6.8.tar.gz) = 5c244f730d7aaee32db4b0cc77b688f74a5caa71 RMD160 (guile-1.6.8.tar.gz) = 9c2c6a6afe2adce458e30e97da782ae18ce75b5c @@ -12,4 +12,6 @@ SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a SHA1 (patch-ai) = 73e4a95dc9e9ede4d423e3a73fc2b0ac4f4802e0 SHA1 (patch-aj) = 2d55986fd8161bdc32c6e2ef7fe3d89310ab20cd SHA1 (patch-ak) = 8cb47bf5d2c3818f860c459180507d4b2eae0b60 +SHA1 (patch-libguile_guile-snarf-docs.in) = 6c8b01350e7585c4f7bb650e3f7f991e231629b1 +SHA1 (patch-libguile_guile-snarf.in) = f1e0ace27799bcf4fd3f8c81607e4da5aeda7e23 SHA1 (patch-scripts-snarf-check-and-output-texi) = 49ea1065f77925ff9417eb49bd8790d2c4f16202 diff --git a/lang/guile16/patches/patch-libguile_guile-snarf-docs.in b/lang/guile16/patches/patch-libguile_guile-snarf-docs.in new file mode 100644 index 00000000000..57e45aff564 --- /dev/null +++ b/lang/guile16/patches/patch-libguile_guile-snarf-docs.in @@ -0,0 +1,11 @@ +$NetBSD: patch-libguile_guile-snarf-docs.in,v 1.1 2013/10/04 18:35:22 joerg Exp $ + +--- libguile/guile-snarf-docs.in.orig 2013-09-29 06:44:33.000000000 +0000 ++++ libguile/guile-snarf-docs.in +@@ -23,4 +23,5 @@ bindir=`dirname $0` + ## Let the user override the preprocessor autoconf found. + test -n "${CPP+set}" || CPP="@CPP@" + +-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" ++${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" | grep -v '^#' | sed 's,\^ *\^ {,\ ++&,g' diff --git a/lang/guile16/patches/patch-libguile_guile-snarf.in b/lang/guile16/patches/patch-libguile_guile-snarf.in new file mode 100644 index 00000000000..a6cb28ea440 --- /dev/null +++ b/lang/guile16/patches/patch-libguile_guile-snarf.in @@ -0,0 +1,14 @@ +$NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $ + +--- libguile/guile-snarf.in.orig 2005-06-09 22:42:54.000000000 +0000 ++++ libguile/guile-snarf.in +@@ -51,7 +51,8 @@ modern_snarf () + ## empty file. + echo "/* cpp arguments: $@ */" ; + ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true +- grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" ++ sed 's,\^ *\^,\ ++&,g' ${temp} | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" + } + + ## main |