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

- remove dependency on slib, provide support through triggers 

- fix multilib -devel conflicts in guile-snarf and scmconfig.h (#192684)
This commit is contained in:
Miroslav Lichvar 2006-05-24 11:58:21 +00:00
parent 589d3f1f57
commit 3d72999bba
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
guile-1.8.0-multilib.patch Normal file
View File

@ -0,0 +1,42 @@
--- guile-1.8.0/libguile/Makefile.in.multilib 2006-05-23 14:28:20.000000000 +0200
+++ guile-1.8.0/libguile/Makefile.in 2006-05-23 15:52:05.000000000 +0200
@@ -1622,6 +1622,11 @@
f=$(am__strip_dir) \
echo " $(nodist_modincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(modincludedir)/$$f'"; \
$(nodist_modincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(modincludedir)/$$f"; \
+ if [ "$$f" = "scmconfig.h" ]; then \
+ grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
+ mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
+ $(nodist_modincludeHEADERS_INSTALL) "$${d}scmconfig.h.mlib" "$(DESTDIR)$(modincludedir)/$$f"; \
+ fi; \
done
uninstall-nodist_modincludeHEADERS:
--- guile-1.8.0/libguile/guile-snarf.in.multilib 2006-02-12 14:29:12.000000000 +0100
+++ guile-1.8.0/libguile/guile-snarf.in 2006-05-23 15:53:23.000000000 +0200
@@ -39,7 +39,6 @@
# #endif
#
# If the environment variable CPP is set, use its value instead of the
-# C pre-processor determined at Guile configure-time: "@CPP@".
# Code:
@@ -72,7 +71,7 @@
tempdir="/tmp/snarf.$$"
(umask 077 && mkdir $tempdir) || exit 1
temp="$tempdir/tmp"
-if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
+if [ x"$CPP" = x ] ; then cpp="gcc -E" ; else cpp="$CPP" ; fi
trap "rm -rf $tempdir" 0 1 2 15
--- guile-1.8.0/libguile/scmconfig.h.mlib.multilib 1970-01-01 01:00:00.000000000 +0100
+++ guile-1.8.0/libguile/scmconfig.h.mlib 2006-05-23 15:51:30.000000000 +0200
@@ -0,0 +1,6 @@
+#include <bits/wordsize.h>
+#if __WORDSIZE == 32
+#include "libguile/scmconfig-32.h"
+#else
+#include "libguile/scmconfig-64.h"
+#endif

21
guile.spec
View File

@ -1,18 +1,18 @@
Summary: A GNU implementation of Scheme for application extensibility.
Name: guile
Version: 1.8.0
Release: 4
Release: 5
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
URL: http://www.gnu.org/software/guile/
Patch1: guile-1.8.0-rpath.patch
Patch2: guile-1.8.0-slib.patch
Patch3: guile-1.8.0-stacksize.patch
Patch4: guile-1.8.0-deplibs.patch
Patch5: guile-1.8.0-multilib.patch
License: GPL
Group: Development/Languages
Buildroot: %{_tmppath}/%{name}-root
BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
Requires: slib >= 3a1
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
Epoch: 5
@ -46,6 +46,7 @@ install the guile package.
%patch2 -p1 -b .slib
%patch3 -p1 -b .stacksize
%patch4 -p1 -b .deplibs
%patch5 -p1 -b .multilib
%build
@ -59,8 +60,6 @@ rm -rf $RPM_BUILD_ROOT
%{makeinstall}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site
ln -s ../../slib ${RPM_BUILD_ROOT}%{_datadir}/guile/site/slib
ln -s ../../slib/slibcat ${RPM_BUILD_ROOT}%{_datadir}/guile/site/slibcat
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libguile*.la
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
@ -88,6 +87,16 @@ if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/guile-tut.info.gz %{_infodir}/dir
fi
%triggerin -- slib
ln -sfn ../../slib %{_datadir}/guile/site/slib
rm -f %{_datadir}/guile/site/slibcat
%{_bindir}/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
%triggerun -- slib
if [ "$1" = 0 -o "$2" = 0 ]; then
rm -f %{_datadir}/guile/site/{slib,slibcat}
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING* ChangeLog HACKING NEWS.bz2 README
@ -111,6 +120,10 @@ fi
%{_includedir}/libguile.h
%changelog
* Wed May 24 2006 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.0-5
- remove dependency on slib, provide support through triggers
- fix multilib -devel conflicts in guile-snarf and scmconfig.h (#192684)
* Thu May 18 2006 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.0-4
- add gmp-devel to requires for devel package (#192107)
- fix guile-config link (#191595)