From 3ffa98df732fbf4eea0de3250d863ad6402ccb3e Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Aug 09 2009 21:39:19 +0000 Subject: new release 3.2b --- diff --git a/bigloo-destdir.patch b/bigloo-destdir.patch new file mode 100644 index 0000000..5fa2413 --- /dev/null +++ b/bigloo-destdir.patch @@ -0,0 +1,24 @@ +diff -up bigloo3.2b/bdb/Makefile.destdir bigloo3.2b/bdb/Makefile +--- bigloo3.2b/bdb/Makefile.destdir 2009-08-09 13:14:05.000000000 -0600 ++++ bigloo3.2b/bdb/Makefile 2009-08-09 13:17:38.000000000 -0600 +@@ -85,14 +85,14 @@ install: + mkdir -p $(DESTDIR)$(BINDIR) && \ + cp $(BOOTBINDIR)/bdb $(DESTDIR)$(BINDIR) && \ + chmod $(BMASK) $(DESTDIR)$(BINDIR)/bdb && \ +- mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \ +- cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \ +- chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \ ++ mkdir -p $(LIBDIR)/$(FILDIR) && \ ++ cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \ ++ chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \ + fi + if [ $(FILDIR) != $(BOOTLIBDIR) ]; then \ +- mkdir -p $(DESTDIR)$(LIBDIR)/$(FILDIR) && \ +- cp $(BOOTLIBDIR)/bdb.heap $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap && \ +- chmod $(BMASK) $(DESTDIR)$(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \ ++ mkdir -p $(LIBDIR)/$(FILDIR) && \ ++ cp $(BOOTLIBDIR)/bdb.heap $(LIBDIR)/$(FILDIR)/bdb.heap && \ ++ chmod $(BMASK) $(LIBDIR)/$(FILDIR)/bdb.heap || exit 1; \ + fi + $(MAKE) install-lib LIB=libbigloobdb_s-$(RELEASE) + diff --git a/bigloo-java-1.5.patch b/bigloo-java-1.5.patch deleted file mode 100644 index 4c59e3d..0000000 --- a/bigloo-java-1.5.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up bigloo3.1b/runtime/Jlib/JDK15.java.java-1.5 bigloo3.1b/runtime/Jlib/JDK15.java ---- bigloo3.1b/runtime/Jlib/JDK15.java.java-1.5 2008-09-15 12:12:36.000000000 +0200 -+++ bigloo3.1b/runtime/Jlib/JDK15.java 2008-09-18 22:38:19.000000000 +0200 -@@ -21,11 +21,11 @@ public class JDK15 extends JDK { - // JDK1.5 methods - - public Method getDeclaredMethodImpl( Class c, byte[] m ) throws Exception { -- return c.getDeclaredMethod( new String( m ) ); -+ return c.getDeclaredMethod( new String( m ), null ); - } - - public Object invokeImpl( Method m ) throws Exception { -- return m.invoke( null ); -+ return m.invoke( null, null ); - } - - public Object invoke3Impl(Method m, int n, byte[] a) throws Exception { diff --git a/bigloo-javaht.patch b/bigloo-javaht.patch deleted file mode 100644 index 95d0015..0000000 --- a/bigloo-javaht.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up bigloo3.1b/runtime/Jlib/dlopen.java.javaht bigloo3.1b/runtime/Jlib/dlopen.java ---- bigloo3.1b/runtime/Jlib/dlopen.java.javaht 2008-09-18 20:24:59.000000000 +0200 -+++ bigloo3.1b/runtime/Jlib/dlopen.java 2008-09-18 20:25:59.000000000 +0200 -@@ -181,9 +181,9 @@ public abstract class dlopen { - final byte[] init_sym, - final byte[] mod_sym ) { - synchronized( dlopen_table ) { -- if( !(dlopen_table.contains( filename )) ) { -+ if( !(dlopen_table.containsKey( filename )) ) { - int res = dload_inner( filename, init_sym, mod_sym ); -- dlopen_table.put( filename, new Boolean( true ) ); -+ dlopen_table.put( filename, Boolean.valueOf( true ) ); - return res; - } else { - return 0; diff --git a/bigloo-javassl.patch b/bigloo-javassl.patch deleted file mode 100644 index c445bfd..0000000 --- a/bigloo-javassl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- bigloo3.0a/api/ssl/Makefile.javassl 2007-06-01 22:38:56.000000000 +0200 -+++ bigloo3.0a/api/ssl/Makefile 2007-06-01 22:39:30.000000000 +0200 -@@ -38,10 +38,6 @@ - fi - - boot-jvm: -- @ if [ "$(JVMBACKEND)" = "yes" ]; then \ -- echo ">>> JVM"; \ -- (cd src && $(MAKE) jvm); \ -- fi - - boot-dotnet: - boot-dotnet_unimplemented: -@@ -119,19 +115,6 @@ - fi - - install-jvm: -- if [ $(DESTDIR)$(FILDIR) != $(BOOTLIBDIR) ]; then \ -- cp $(BOOTLIBDIR)/ssl.jheap $(DESTDIR)$(FILDIR)/ssl.jheap && \ -- chmod $(BMASK) $(DESTDIR)$(FILDIR)/ssl.jheap && \ -- cp $(BOOTLIBDIR)/bigloossl_s-$(RELEASE).zip $(DESTDIR)$(FILDIR) && \ -- chmod $(BMASK) $(DESTDIR)$(FILDIR)/bigloossl_s-$(RELEASE).zip && \ -- cp $(BOOTLIBDIR)/bigloossl_e-$(RELEASE).zip $(DESTDIR)$(FILDIR) && \ -- chmod $(BMASK) $(DESTDIR)$(FILDIR)/bigloossl_e-$(RELEASE).zip; \ -- cp $(BOOTLIBDIR)/commons-ssl.zip $(DESTDIR)$(FILDIR) && \ -- chmod $(BMASK) $(DESTDIR)$(FILDIR)/commons-ssl.zip; \ -- fi -- (cd $(DESTDIR)$(FILDIR) && \ -- $(RM) -f bigloossl_u-$(RELEASE).zip && \ -- ln bigloossl_s-$(RELEASE).zip bigloossl_u-$(RELEASE).zip) - - install-dotnet: - install-dotnet_unimplemented: diff --git a/bigloo.spec b/bigloo.spec index 61e391a..b0f778b 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -1,32 +1,30 @@ -%define _with_java 1 - -Name: bigloo -Version: 3.1b -Release: 6%{?dist} -Summary: Bigloo is compiler for the Scheme programming language - -Group: Development/Languages -License: GPLv2+ -URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz -Patch1: bigloo-javaht.patch -Patch2: bigloo-java-1.5.patch +Name: bigloo +Version: 3.2b +Release: 1%{?dist} +Summary: Bigloo is compiler for the Scheme programming language + +Group: Development/Languages +License: GPLv2+ +URL: http://www-sop.inria.fr/mimosa/fp/Bigloo +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}-2.tar.gz +Patch3: bigloo-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el BuildRequires: xemacs BuildRequires: xemacs-el -BuildRequires: indent BuildRequires: /sbin/install-info +BuildRequires: indent +BuildRequires: java-1.6.0-openjdk-devel BuildRequires: zip -BuildRequires: indent -BuildRequires: sqlite-devel -BuildRequires: java-1.5.0-gcj-devel -BuildRequires: gstreamer-plugins-base-devel -BuildRequires: gstreamer-devel +BuildRequires: gc-devel BuildRequires: gmp-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel +BuildRequires: indent BuildRequires: openssl-devel -Requires: bigloo-libs = %{version}-%{release} +BuildRequires: sqlite-devel +Requires: bigloo-libs = %{version}-%{release} Requires: indent Requires: gmp-devel Requires(post): /sbin/install-info @@ -80,8 +78,7 @@ XEmacs development environment for Bigloo %prep %setup -q -n %{name}%{version} -%patch1 -p1 -%patch2 -p1 +%patch3 -p1 sed -i 's|bmask=755|bmask=644|' configure @@ -89,8 +86,12 @@ sed -i 's|bmask=755|bmask=644|' configure %define emacslisppath %{_datadir}/emacs/site-lisp %define xemacslisppath %{_datadir}/xemacs/site-packages/lisp %define inplace `pwd`/inplace -%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g'`" +%define bigloo_opt_flags "`echo $RPM_OPT_FLAGS | sed 's/-Wall/-w/g' | sed 's/FORTIFY_SOURCE=./FORTIFY_SOURCE=0/g'`" +%define bigloo_opt_flags_ -O2 -g -pipe -fexceptions -fstack-protector --param=ssp-buffer-size=4 + +CFLAGS="%bigloo_opt_flags" +export CFLAGS ./configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ @@ -103,13 +104,13 @@ sed -i 's|bmask=755|bmask=644|' configure --native-default-backend \ --emacs=emacs \ --dotnet=no \ - %{?_with_java: --jvm=yes} \ - %{!?_with_java: --jvm=no} \ + --jvm=yes \ --sharedbde=yes \ --sharedcompiler=yes \ - --coflags=%{bigloo_opt_flags} + --customgc=no \ + --coflags="$CFLAGS" -sed -i 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config +sed -i 's/^EMACSBRAND.*/EMACSBRAND=emacs22/g' Makefile.config # _smp_mflags breaks the build env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ @@ -129,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ make DESTDIR=$RPM_BUILD_ROOT install env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ - make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=$RPM_BUILD_ROOT%{emacslisppath}/bigloo install-bee + make DESTDIR=$RPM_BUILD_ROOT EMACSDIR=%{emacslisppath}/bigloo install-bee make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee # fix permissions @@ -142,10 +143,10 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/* rm -f *.so mv bigloo/%{version}/*.so . # seems to need to be hard linked so that it is provided by the package - for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web - do - ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so - done +# for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web +# do +# ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so +# done (cd bigloo/%{version}; ln -sf ../../*.so .) ) @@ -226,6 +227,9 @@ fi %changelog +* Sun Aug 9 2009 Gerard Milmeister - 3.2b-1 +- new release 3.2b + * Fri Jul 24 2009 Fedora Release Engineering - 3.1b-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 26e4e09..c384655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c44c3dc0f3b8953178a7918e4c442ab bigloo3.1b.tar.gz +48d8853e108436469ee858116b3da00d bigloo3.2b-2.tar.gz