rpms/bigloo/F-7 bigloo-javaht.patch, NONE, 1.1 bigloo-javassl.patch, NONE, 1.1 bigloo.spec, 1.23, 1.24

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/pkgs/rpms/bigloo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26395

Modified Files:
	bigloo.spec 
Added Files:
	bigloo-javaht.patch bigloo-javassl.patch 
Log Message:
java fixes

bigloo-javaht.patch:

--- NEW FILE bigloo-javaht.patch ---
--- 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;

bigloo-javassl.patch:

--- NEW FILE bigloo-javassl.patch ---
--- 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:


Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/F-7/bigloo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bigloo.spec	1 Jun 2007 19:41:30 -0000	1.23
+++ bigloo.spec	1 Jun 2007 22:27:52 -0000	1.24
@@ -2,14 +2,16 @@
 
 Name:		bigloo
 Version: 	3.0a
-Release:	2%{?dist}
+Release:	3%{?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
-Patch1:		bigloo-java-1.5.patch
+Patch0:         bigloo-javassl.patch
+Patch1:         bigloo-javaht.patch
+Patch2:		bigloo-java-1.5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs
 BuildRequires:	emacs-el
@@ -73,7 +75,9 @@
 
 %prep
 %setup -q -n %{name}%{version}
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
 
 
@@ -211,6 +215,9 @@
 
 
 %changelog
+* Fri Jun  1 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-3
+- remove java ssl since it does not build with libgcj
+
 * Fri Jun  1 2007 Gerard Milmeister <gemi at bluewin.ch> - 3.0a-1
 - new version 3.0a