diff --git a/bigloo-javaht.patch b/bigloo-javaht.patch new file mode 100644 index 0000000..ffe0fab --- /dev/null +++ b/bigloo-javaht.patch @@ -0,0 +1,14 @@ +--- bigloo3.0a/runtime/Jlib/dlopen.java.javaht 2007-06-01 22:53:49.000000000 +0200 ++++ bigloo3.0a/runtime/Jlib/dlopen.java 2007-06-01 22:54:34.000000000 +0200 +@@ -137,9 +137,9 @@ + + public static int dload( final byte[] filename, final byte[] init_sym ) { + synchronized( dlopen_table ) { +- if( !(dlopen_table.contains( filename )) ) { ++ if( !(dlopen_table.containsKey( filename )) ) { + int res = dload_inner( filename, init_sym ); +- dlopen_table.put( filename, true ); ++ dlopen_table.put( filename, Boolean.valueOf(true) ); + return res; + } else { + return 0; diff --git a/bigloo-javassl.patch b/bigloo-javassl.patch new file mode 100644 index 0000000..c445bfd --- /dev/null +++ b/bigloo-javassl.patch @@ -0,0 +1,33 @@ +--- 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 de32501..3a7b708 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -2,13 +2,15 @@ Name: bigloo Version: 3.0a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo%{version}.tar.gz +Patch0: bigloo-javassl.patch +Patch1: bigloo-javaht.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -72,6 +74,8 @@ XEmacs development environment for Bigloo %prep %setup -q -n %{name}%{version} +%patch0 -p1 +%patch1 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -209,6 +213,9 @@ fi %changelog +* Fri Jun 1 2007 Gerard Milmeister - 3.0a-2 +- remove java ssl since it does not build with libgcj + * Fri Jun 1 2007 Gerard Milmeister - 3.0a-1 - new version 3.0a