diff options
| author | Miroslav Lichvar <mlichvar@fedoraproject.org> | 2009-11-19 17:21:40 +0000 |
|---|---|---|
| committer | Miroslav Lichvar <mlichvar@fedoraproject.org> | 2009-11-19 17:21:40 +0000 |
| commit | ac37a89b73ccc8efc1841dc001069e2e0bc008c6 (patch) | |
| tree | 379edfe55559b75c8927d25215ecc92730374888 | |
| parent | f9a67a31dbdf5bab1ec3ff1908e1dda69fd5d108 (diff) | |
| download | guile-ac37a89b73ccc8efc1841dc001069e2e0bc008c6.tar.gz guile-ac37a89b73ccc8efc1841dc001069e2e0bc008c6.tar.xz guile-ac37a89b73ccc8efc1841dc001069e2e0bc008c6.zip | |
- fix building with new cpp (#538707)guile-1_8_7-4_fc13
| -rw-r--r-- | guile-1.8.7-linemarkers.patch | 21 | ||||
| -rw-r--r-- | guile.spec | 7 |
2 files changed, 27 insertions, 1 deletions
diff --git a/guile-1.8.7-linemarkers.patch b/guile-1.8.7-linemarkers.patch new file mode 100644 index 0000000..4330c24 --- /dev/null +++ b/guile-1.8.7-linemarkers.patch @@ -0,0 +1,21 @@ +diff -up guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers guile-1.8.7/libguile/guile-snarf-docs.in +--- guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers 2009-07-04 00:19:00.000000000 +0200 ++++ guile-1.8.7/libguile/guile-snarf-docs.in 2009-11-19 17:58:03.000000000 +0100 +@@ -23,4 +23,4 @@ bindir=`dirname $0` + ## Let the user override the preprocessor autoconf found. + test -n "${CPP+set}" || CPP="@CPP@" + +-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" ++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@" +diff -up guile-1.8.7/libguile/guile-snarf.in.linemarkers guile-1.8.7/libguile/guile-snarf.in +--- guile-1.8.7/libguile/guile-snarf.in.linemarkers 2009-11-19 16:31:46.000000000 +0100 ++++ guile-1.8.7/libguile/guile-snarf.in 2009-11-19 18:10:09.000000000 +0100 +@@ -49,7 +49,7 @@ modern_snarf () + ## Apparently, AIX's preprocessor is unhappy if you try to #include an + ## empty file. + echo "/* cpp arguments: $@ */" ; +- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true ++ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true + grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" + } + @@ -4,13 +4,14 @@ Summary: A GNU implementation of Scheme for application extensibility Name: guile %define mver 1.8 Version: 1.8.7 -Release: 3%{?dist} +Release: 4%{?dist} Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz URL: http://www.gnu.org/software/guile/ Patch1: guile-1.8.7-multilib.patch Patch2: guile-1.8.7-testsuite.patch Patch3: guile-1.8.7-ia64jmp.patch Patch4: guile-1.8.6-deplibs.patch +Patch5: guile-1.8.7-linemarkers.patch License: GPLv2+ and LGPLv2+ Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +54,7 @@ install the guile package. %patch2 -p1 -b .testsuite %patch3 -p1 -b .ia64jmp %patch4 -p1 -b .deplibs +%patch5 -p1 -b .linemarkers %build @@ -186,6 +188,9 @@ fi %{_includedir}/libguile.h %changelog +* Thu Nov 19 2009 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-4 +- fix building with new cpp (#538707) + * Tue Sep 22 2009 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.7-3 - suppress install-info errors (#515977) - avoid clash with system setjmp/longjmp on IA64 |