rpms/bigloo/devel bigloo-destdir.patch, NONE, 1.1 bigloo.spec, 1.32, 1.33 sources, 1.17, 1.18 bigloo-java-1.5.patch, 1.2, NONE bigloo-javaht.patch, 1.3, NONE bigloo-javassl.patch, 1.1, NONE
Gérard Milmeister
gemi at fedoraproject.org
Sun Aug 9 21:39:19 UTC 2009
Author: gemi
Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26504
Modified Files:
bigloo.spec sources
Added Files:
bigloo-destdir.patch
Removed Files:
bigloo-java-1.5.patch bigloo-javaht.patch bigloo-javassl.patch
Log Message:
new release 3.2b
bigloo-destdir.patch:
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE bigloo-destdir.patch ---
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)
Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- bigloo.spec 24 Jul 2009 18:01:40 -0000 1.32
+++ bigloo.spec 9 Aug 2009 21:39:19 -0000 1.33
@@ -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 Biglo
%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|' configur
%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|' configur
--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 <gemi at bluewin.ch> - 3.2b-1
+- new release 3.2b
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1b-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 18 Sep 2008 19:17:25 -0000 1.17
+++ sources 9 Aug 2009 21:39:19 -0000 1.18
@@ -1 +1 @@
-1c44c3dc0f3b8953178a7918e4c442ab bigloo3.1b.tar.gz
+48d8853e108436469ee858116b3da00d bigloo3.2b-2.tar.gz
--- bigloo-java-1.5.patch DELETED ---
--- bigloo-javaht.patch DELETED ---
--- bigloo-javassl.patch DELETED ---
More information about the fedora-extras-commits
mailing list