rpms/snobol/F-9 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec, 1.1, 1.2 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Apr 23 18:38:19 UTC 2009
- Previous message (by thread): rpms/snobol/F-10 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec, 1.1, 1.2 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
- Next message (by thread): rpms/xorg-x11-server/F-11 xserver-1.6.1-avoid-malloc-for-logging.patch, NONE, 1.1 xorg-x11-server.spec, 1.440, 1.441
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/snobol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4652
Modified Files:
snobol.spec sources
Added Files:
snobol-4.1.2-config.patch
Removed Files:
snobol-4.1.1-config.patch
Log Message:
New upstream release
snobol-4.1.2-config.patch:
--- NEW FILE snobol-4.1.2-config.patch ---
diff -up snobol4-1.2/configure.bak snobol4-1.2/configure
--- snobol4-1.2/configure.bak 2007-03-07 01:21:34.000000000 +0100
+++ snobol4-1.2/configure 2009-04-23 20:13:48.000000000 +0200
@@ -125,6 +125,9 @@ while [ $# -gt 0 ]; do
STUFF=`echo "$1" | sed 's/--bindir=//'`
echo "BINDIR=$STUFF" >> $CONFIG_M4
;;
+ --libdir=*)
+ LIBDIR=`echo "$1" | sed 's/--libdir=//'`
+ ;;
--debug)
DEBUG=true
set -x
@@ -255,9 +258,10 @@ if [ "x$MANDIR" = x ]; then
fi
MAN1DIR="$MANDIR/man1"
MAN3DIR="$MANDIR/man3"
-SNOLIB_DIR="$PREFIX/lib/snobol4"
+SNOLIB_DIR="$PREFIX/share/snobol4"
echo 'BINDIR=$(DESTDIR)'"$BINDIR" >> $CONFIG_M4
+echo 'LIBDIR=$(DESTDIR)'"$LIBDIR" >> $CONFIG_M4
echo 'MANDIR=$(DESTDIR)'"$MANDIR" >> $CONFIG_M4
echo 'MAN1DIR=$(DESTDIR)'"$MAN1DIR" >> $CONFIG_M4
echo 'MAN3DIR=$(DESTDIR)'"$MAN3DIR" >> $CONFIG_M4
@@ -452,7 +456,7 @@ if [ "$GCCPATH" -a "$WANTGCC" ]; then
# w/ gcc v3 -O3 turns on things OTHER than -finline-functions,
# so make -O3 the default, and use -fno-inline-functions
- OPT=-O3
+ # OPT=-O3
if [ ! "$INLINE_OK" ]; then
echo 'ADD_OPT([-fno-inline-functions])' >> $CONFIG_M4
@@ -1030,7 +1034,7 @@ if [ -f $INCDIR/sys/socket.h ]; then
echo '#define SOCKLEN_T '$SOCKLEN_T >> $CONFIG_H
# add network libraries if needed
- if [ -f /usr/lib/libsocket.a -o -f /usr/lib/libsocket.so ]; then
+ if [ -f $LIBDIR/libsocket.a -o -f $LIBDIR/libsocket.so ]; then
# SCO, SunOS5
echo 'using libsocket' 1>&2
echo 'ADD_LDFLAGS([-lsocket])' >> $CONFIG_M4
diff -up snobol4-1.2/Makefile2.m4.bak snobol4-1.2/Makefile2.m4
--- snobol4-1.2/Makefile2.m4.bak 2008-03-31 22:27:35.000000000 +0200
+++ snobol4-1.2/Makefile2.m4 2009-04-23 20:15:32.000000000 +0200
@@ -33,6 +33,10 @@ define([_CFLAGS],[undivert(6)])dnl
OPT=-O
+VERSION=4.1.1
+
+TOPDIR=$(PWD)
+
CCM=./cc-M
# for pow(3)
@@ -42,13 +46,13 @@ SH=sh
SHELL=/bin/sh
# library random accessifier
-RANLIB=ranlib
+RANLIB=gcc --shared
# filename for external function library
-SNOLIB_A=snolib.a
+SNOLIB_A=libsnobol.so
# default file to load
-SNOLIB_FILE=snolib.a
+SNOLIB_FILE=libsnobol.so
# either snobol4 or isnobol4;
# isnobol4 has had functions reordered for better inlining.
@@ -180,7 +184,7 @@ LDFLAGS=[]_LDFLAGS
################
# compiler flags
-CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS)
+CFLAGS=[]_CFLAGS $(COPT) $(MYCPPFLAGS) -fPIC
################
@@ -228,9 +232,9 @@ changequote([,])dnl
snobol4: xsnobol4 snobol4.c test/tests.in
@echo Running regression tests...
- (cd test; ./run.sh ../xsnobol4)
+ (export LD_LIBRARY_PATH=$(TOPDIR); cd test; ./run.sh ../xsnobol4)
@echo Passed regression tests.
- ./timing > timing.out
+ (export LD_LIBRARY_PATH=$(TOPDIR); ./timing > timing.out)
-rm -f snobol4$(EXT)
ln xsnobol4$(EXT) snobol4$(EXT)
@touch snobol4$(EXT)
@@ -417,10 +421,16 @@ SNOLIB_OBJS=chop.o cos.o delete.o enviro
ord.o log.o logic.o rename.o retstring.o serv.o sin.o \
sprintf.o sqrt.o sset.o sys.o tan.o $(AUX_OBJS)
-$(SNOLIB_A): $(SNOLIB_OBJS)
- rm -f $(SNOLIB_A)
- ar $(ARXFLAGS) rv $(SNOLIB_A) $(SNOLIB_OBJS)
- $(RANLIB) $(SNOLIB_A)
+libsnobol.so.$(VERSION): $(SNOLIB_OBJS)
+ rm -f libsnobol.so.$(VERSION)
+ $(CC) $(LDFLAGS) --shared -Wl,--export-dynamic -Wl,-soname -Wl,libsnobol.so.4 \
+ -o libsnobol.so.$(VERSION) $(SNOLIB_OBJS)
+
+libsnobol.so: libsnobol.so.$(VERSION)
+ rm -rf libsnobol.so
+ rm -rf libsnobol.so.4
+ ln -sf libsnobol.so.$(VERSION) libsnobol.so.4
+ ln -sf libsnobol.so.4 libsnobol.so
################
# snolib files
@@ -535,7 +545,7 @@ INSTALL_H=[include]/h.h [include]/snotyp
# generated SNOLIB files (host.sno generated at top level)
GENSNOLIB=host.sno
-SNOLIB_FILES=snolib/*.sno $(INSTALL_H) doc/load.txt README $(GENSNOLIB)
+SNOLIB_FILES=snolib/*.sno $(GENSNOLIB)
VERS=`./pv`
install: snobol4 pv
@@ -549,10 +559,19 @@ install: snobol4 pv
$(INSTALL) -m 644 doc/snolib.3 $(MAN3DIR)
$(INSTALL) -m 644 doc/snobol4dbm.3 $(MAN3DIR)
$(INSTALL) -m 644 doc/snobol4tcl.3 $(MAN3DIR)
+ $(INSTALL) -d $(DESTDIR)/usr/include/snobol4/
+ for F in $(INSTALL_H); do \
+ $(INSTALL) -m 644 $$F $(DESTDIR)/usr/include/snobol4/; \
+ done
$(INSTALL) -d $(SNOLIB_DIR)
for F in $(SNOLIB_FILES); do \
$(INSTALL) -m 644 $$F $(SNOLIB_DIR); \
done
+ $(INSTALL) -d $(LIBDIR)
+ $(INSTALL) -m 755 libsnobol.so.$(VERSION) $(LIBDIR)
+ ( cd $(LIBDIR); rm -rf libsnobol.so.4; ln -sf libsnobol.so.$(VERSION) libsnobol.so.4 )
+ ( cd $(LIBDIR); rm -rf libsnobol.so; ln -sf libsnobol.so.$(VERSION) libsnobol.so )
+
@echo '*********************************************************' 1>&2
@echo 'Have you mailed a copy of timing.out to timing at snobol4.org ?' 1>&2
@echo '*********************************************************' 1>&2
Index: snobol.spec
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-9/snobol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snobol.spec 10 Sep 2008 15:52:07 -0000 1.1
+++ snobol.spec 23 Apr 2009 18:37:48 -0000 1.2
@@ -1,15 +1,15 @@
-%define snobrel 1.1
+%define snobrel 1.2
Name: snobol
Version: 4.%{snobrel}
-Release: 6%{?dist}
-Summary: Macro Implementation of SNOBOL4 in C
+Release: 1%{?dist}
+Summary: The SNOBOL programming language
Group: Development/Languages
License: BSD
URL: http://www.snobol4.org
Source0: ftp://ftp.ultimate.com/%{name}/%{name}4-%{snobrel}.tar.gz
-Patch1: snobol-4.1.1-config.patch
+Patch1: snobol-4.1.2-config.patch
Patch2: snobol-4.1.1-doc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel
@@ -70,6 +70,15 @@
%{_libdir}/libsnobol.so
%changelog
+* Thu Apr 23 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.1.2-1
+- New upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-7
+- Reworking the summary of the package
+
* Thu Aug 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.1.1-6
- Try to minimize undef. non-weak symbols
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snobol/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Sep 2008 15:52:07 -0000 1.2
+++ sources 23 Apr 2009 18:37:48 -0000 1.3
@@ -1 +1 @@
-101df7f3c74abb5703a01a85e58b4e9d snobol4-1.1.tar.gz
+5265d1e21b8d1963e0c7fe830c3d5172 snobol4-1.2.tar.gz
--- snobol-4.1.1-config.patch DELETED ---
- Previous message (by thread): rpms/snobol/F-10 snobol-4.1.2-config.patch, NONE, 1.1 snobol.spec, 1.1, 1.2 sources, 1.2, 1.3 snobol-4.1.1-config.patch, 1.1, NONE
- Next message (by thread): rpms/xorg-x11-server/F-11 xserver-1.6.1-avoid-malloc-for-logging.patch, NONE, 1.1 xorg-x11-server.spec, 1.440, 1.441
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list