rpms
/
guile
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix building with new cpp (#538707)

This commit is contained in:
Miroslav Lichvar 2009-11-19 17:21:40 +00:00
parent f9a67a31db
commit ac37a89b73
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
guile-1.8.7-linemarkers.patch Normal file
View File

@ -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/\^\ *:\ *\^.*/;/"
}

7
guile.spec
View File

@ -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