rpms/bigloo/devel bigloo-bmem.patch,NONE,1.1 bigloo.spec,1.2,1.3

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/bigloo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000/devel

Modified Files:
	bigloo.spec 
Added Files:
	bigloo-bmem.patch 
Log Message:


bigloo-bmem.patch:

--- NEW FILE bigloo-bmem.patch ---
--- bigloo2.7a/bde/Makefile.bmem	2005-11-28 11:01:19.000000000 +0100
+++ bigloo2.7a/bde/Makefile	2005-11-28 11:02:21.000000000 +0100
@@ -123,16 +123,11 @@
      $(BOOTBINDIR)/btags \
      $(BOOTBINDIR)/bprof \
      $(BOOTBINDIR)/jas \
-     $(BOOTBINDIR)/mco \
-     dobmem
+     $(BOOTBINDIR)/mco
 
 boot:
 	$(MAKE) all BFLAGS="$(BFLAGS) -ld-relative"
 
-dobmem:
-	@ if [ "$(LDPRELOADSUPPORT)" = "yes" ]; then \
-	    (cd bmem && $(MAKE)) || exit 1; \
-	  fi
 
 $(BOOTBINDIR)/afile: $(AFILE_OBJ)
 	$(BIGLOO) $(BFLAGS) $(EFLAGS) -o $(BOOTBINDIR)/afile $(AFILE_OBJ)
@@ -199,9 +194,6 @@
           chmod $(BMASK) $(DESTDIR)$(BINDIR)/btags$(EXE_SUFFIX); \
 	  cp $(BOOTBINDIR)/jas$(EXE_SUFFIX) $(DESTDIR)$(BINDIR)/jas$(EXE_SUFFIX); \
           chmod $(BMASK) $(DESTDIR)$(BINDIR)/jas$(EXE_SUFFIX); \
-          if [ "$(LDPRELOADSUPPORT)" = "yes" ]; then \
-	    (cd bmem; $(MAKE) install) || exit 1; \
-          fi; \
         fi
 
 #*---------------------------------------------------------------------*/
@@ -217,7 +209,6 @@
 	- $(RM) -f $(DESTDIR)$(BINDIR)/bpp$(EXE_SUFFIX)
 	- $(RM) -f $(DESTDIR)$(BINDIR)/btags$(EXE_SUFFIX)
 	- $(RM) -f $(DESTDIR)$(BINDIR)/jas$(EXE_SUFFIX)
-	- (cd bmem; $(MAKE) uninstall)
 
 #*---------------------------------------------------------------------*/
 #*    touchall                                                         */
@@ -247,7 +238,6 @@
                        -o -name '?*#' \
                        -o -name \*core \) \
                      -type f -exec rm {} \;   
-	@ (cd bmem; $(MAKE) clean)
 	@ $(BEEP)
 	@ echo "cleanup done..."
 	@ echo "-------------------------------"
@@ -293,7 +283,6 @@
 .PHONY: pop
 pop:
 	@ echo $(POPULATION:%=bde/%)
-	@ (cd bmem; $(MAKE) pop)
 
 #*---------------------------------------------------------------------*/
 #*     .scm --> .o                                                     */


Index: bigloo.spec
===================================================================
RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bigloo.spec	27 Nov 2005 23:18:00 -0000	1.2
+++ bigloo.spec	28 Nov 2005 10:16:23 -0000	1.3
@@ -2,13 +2,14 @@
 
 Name:		bigloo
 Version: 	2.7a
-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/bigloo2.7a.tar.gz
+Patch0:		bigloo-bmem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info
 BuildRequires:	zip, java-1.4.2-gcj-compat-devel
@@ -63,6 +64,8 @@
 
 %prep
 %setup -q -n %{name}%{version}
+# disable bmem for now
+%patch0 -p1
 perl -pi -e 's|bmask=755|bmask=644|' configure
 
 
@@ -192,6 +195,9 @@
 
 
 %changelog
+* Mon Nov 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.7a-2
+- disable bmem, causes link problems
+
 * Sun Nov 27 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.7a-1
 - New Version 2.7a