rpms/mosml/devel Makefile, NONE, 1.1 mosml-fpic.patch, NONE, 1.1 mosml-install.patch, NONE, 1.1 mosml-ld.patch, NONE, 1.1 mosml-shared.patch, NONE, 1.1 mosml.spec, NONE, 1.1 sources, NONE, 1.1
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Tue Feb 20 10:34:35 UTC 2007
- Previous message: rpms/opencv/FC-6 .cvsignore, 1.3, 1.4 opencv.spec, 1.12, 1.13 sources, 1.3, 1.4
- Next message: rpms/mosml/FC-6 Makefile, NONE, 1.1 mosml-fpic.patch, NONE, 1.1 mosml-install.patch, NONE, 1.1 mosml-ld.patch, NONE, 1.1 mosml-shared.patch, NONE, 1.1 mosml.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gemi
Update of /cvs/extras/rpms/mosml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv666/devel
Added Files:
Makefile mosml-fpic.patch mosml-install.patch mosml-ld.patch
mosml-shared.patch mosml.spec sources
Log Message:
auto-import mosml-2.01-9 on branch devel from mosml-2.01-9.src.rpm
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
mosml-fpic.patch:
--- NEW FILE mosml-fpic.patch ---
--- mosml/src/dynlibs/intinf/Makefile.fpic 2006-04-25 23:02:11.000000000 +0200
+++ mosml/src/dynlibs/intinf/Makefile 2006-04-25 23:02:22.000000000 +0200
@@ -8,7 +8,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT} -fPIC
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=../../camlrunm ../../compiler/mosmlcmp -stdlib ../../mosmllib -P none
--- mosml/src/dynlibs/mgd/Makefile.fpic 2006-04-25 23:02:37.000000000 +0200
+++ mosml/src/dynlibs/mgd/Makefile 2006-04-25 23:02:48.000000000 +0200
@@ -10,7 +10,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) $(ROPT)
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) $(ROPT) -fPIC
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
--- mosml/src/dynlibs/mgdbm/Makefile.fpic 2006-04-25 23:03:24.000000000 +0200
+++ mosml/src/dynlibs/mgdbm/Makefile 2006-04-25 23:03:39.000000000 +0200
@@ -11,7 +11,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR} ${ROPT}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR} ${ROPT} -fPIC
BASELIBS=-lm -ldl
all: libmgdbm.so
--- mosml/src/dynlibs/mpq/Makefile.fpic 2006-04-25 23:03:51.000000000 +0200
+++ mosml/src/dynlibs/mpq/Makefile 2006-04-25 23:03:58.000000000 +0200
@@ -19,7 +19,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR} ${OPT}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR} ${OPT} -fPIC
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
--- mosml/src/dynlibs/mregex/Makefile.fpic 2006-04-25 23:04:06.000000000 +0200
+++ mosml/src/dynlibs/mregex/Makefile 2006-04-25 23:04:13.000000000 +0200
@@ -6,7 +6,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -fPIC
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
--- mosml/src/dynlibs/munix/Makefile.fpic 2006-04-25 23:04:24.000000000 +0200
+++ mosml/src/dynlibs/munix/Makefile 2006-04-25 23:04:30.000000000 +0200
@@ -5,7 +5,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT} -fPIC
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
mosml-install.patch:
--- NEW FILE mosml-install.patch ---
--- mosml/src/compiler/Makefile.install 2003-10-17 18:56:50.000000000 +0200
+++ mosml/src/compiler/Makefile 2003-10-17 18:57:13.000000000 +0200
@@ -117,9 +117,9 @@
rm -f Makefile.bak
install:
- ${INSTALL_DATA} mosmlcmp $(LIBDIR)
- ${INSTALL_DATA} mosmllnk $(LIBDIR)
- ${INSTALL_DATA} mosmltop $(LIBDIR)
+ ${INSTALL_DATA} mosmlcmp $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} mosmllnk $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} mosmltop $(DESTDIR)$(LIBDIR)
promote:
test -f ../mosmlcmp.orig || cp ../mosmlcmp ../mosmlcmp.orig
--- mosml/src/doc/helpsigs/Makefile.install 2003-10-17 19:02:13.000000000 +0200
+++ mosml/src/doc/helpsigs/Makefile 2003-10-17 19:02:33.000000000 +0200
@@ -22,7 +22,7 @@
makebase $(LIBDIR)
install:
- cp helpsigs.val $(LIBDIR)
+ cp helpsigs.val $(DESTDIR)$(LIBDIR)
test -d $(DOCDIR)/mosmllib || mkdir -p $(DOCDIR)/mosmllib
cp htmlsigs/*.html $(DOCDIR)/mosmllib
cp index.html $(DOCDIR)/mosmllib
--- mosml/src/dynlibs/intinf/Makefile.install 2003-10-17 19:05:08.000000000 +0200
+++ mosml/src/dynlibs/intinf/Makefile 2003-10-17 20:08:43.000000000 +0200
@@ -5,29 +5,27 @@
# Where to find GMP header file and compiled library
-GMPDIR=${HOME}/c/gmp-2.0.2
-
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT}
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
-MOSMLC=mosmlc -c
-MOSMLL=mosmlc
+MOSMLC=../../camlrunm ../../compiler/mosmlcmp -stdlib ../../mosmllib -P none
+MOSMLL=$(DESTDIR)$(BINDIR)/mosmlc
MOSMLLEX=mosmllex
MOSMLYACC=mosmlyac
all: libmgmp.so IntInf.uo
install:
- cp libmgmp.so $(LIBDIR)
+ cp libmgmp.so $(DESTDIR)$(LIBDIR)
intinf.o: intinf.c
$(CC) $(CFLAGS) -c -o intinf.o intinf.c
libmgmp.so: intinf.o
- $(DYNLD) -o libmgmp.so intinf.o ${GMPDIR}/libgmp.a
+ $(DYNLD) -o libmgmp.so intinf.o /usr/lib/libgmp.a
test:
mosml testintinf.sml
--- mosml/src/dynlibs/mgd/Makefile.install 2003-10-17 19:28:44.000000000 +0200
+++ mosml/src/dynlibs/mgd/Makefile 2003-10-17 19:46:31.000000000 +0200
@@ -5,12 +5,12 @@
# Where to find gd header file and compiled library
-GDDIR=${HOME}/c/gd-1.7.3
+GDDIR=/usr/lib
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) $(ROPT)
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
@@ -31,7 +31,7 @@
mosml testgdimage.sml
install:
- cp libmgd.so $(LIBDIR)
+ cp libmgd.so $(DESTDIR)$(LIBDIR)
clean:
rm -f *.o
--- mosml/src/dynlibs/mgdbm/Makefile.install 2003-10-17 19:25:18.000000000 +0200
+++ mosml/src/dynlibs/mgdbm/Makefile 2003-10-17 19:46:14.000000000 +0200
@@ -5,21 +5,19 @@
# Where to find GDBM header file and compiled library
-GDBMLIBDIR=${HOME}/c/gdbm-1.7.3
-GDBMINCDIR=${HOME}/c/gdbm-1.7.3
-#GDBMLIBDIR=/usr/lib
-#GDBMINCDIR=/usr/include
+GDBMLIBDIR=/usr/lib
+GDBMINCDIR=/usr/include
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR} ${ROPT}
BASELIBS=-lm -ldl
all: libmgdbm.so
install:
- cp libmgdbm.so $(LIBDIR)
+ cp libmgdbm.so $(DESTDIR)$(LIBDIR)
mgdbm.o: mgdbm.c
$(CC) $(CFLAGS) -c -o mgdbm.o mgdbm.c
--- mosml/src/dynlibs/mmysql/Makefile.install 2003-10-17 19:33:24.000000000 +0200
+++ mosml/src/dynlibs/mmysql/Makefile 2003-10-17 19:46:40.000000000 +0200
@@ -13,7 +13,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
+CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR} ${ROPT}
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
@@ -31,7 +31,7 @@
# $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
install:
- cp libmmysql.so $(LIBDIR)
+ cp libmmysql.so $(DESTDIR)$(LIBDIR)
test:
mosml testmysql.sml
--- mosml/src/dynlibs/mpq/Makefile.install 2003-10-17 19:31:55.000000000 +0200
+++ mosml/src/dynlibs/mpq/Makefile 2003-10-17 19:46:49.000000000 +0200
@@ -19,7 +19,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR} ${OPT}
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
@@ -38,7 +38,7 @@
# $(DYNLD) -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
install:
- cp libmpq.so $(LIBDIR)
+ cp libmpq.so $(DESTDIR)$(LIBDIR)
test:
mosml testpsql.sml
--- mosml/src/dynlibs/mregex/Makefile.install 2003-10-17 19:46:59.000000000 +0200
+++ mosml/src/dynlibs/mregex/Makefile 2003-10-17 19:46:53.000000000 +0200
@@ -24,7 +24,7 @@
$(DYNLD) -o libmregex.so regex-0.12/regex.o mregex.o
install:
- cp libmregex.so $(LIBDIR)
+ cp libmregex.so $(DESTDIR)$(LIBDIR)
test:
mosml testregex.sml
--- mosml/src/dynlibs/msocket/Makefile.install 2003-10-17 19:35:10.000000000 +0200
+++ mosml/src/dynlibs/msocket/Makefile 2003-10-17 19:47:15.000000000 +0200
@@ -6,7 +6,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT}
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
@@ -25,7 +25,7 @@
# $(DYNLD) -o libmsocket.so -lsocket msocket.o
install:
- cp libmsocket.so $(LIBDIR)
+ cp libmsocket.so $(DESTDIR)$(LIBDIR)
test:
mosml testsocket.sml
--- mosml/src/dynlibs/munix/Makefile.install 2003-10-17 19:35:31.000000000 +0200
+++ mosml/src/dynlibs/munix/Makefile 2003-10-17 19:47:22.000000000 +0200
@@ -5,7 +5,7 @@
include ../../Makefile.inc
OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) ${ROPT}
MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
MOSMLC=mosmlc -c
@@ -22,7 +22,7 @@
$(DYNLD) -o libmunix.so munix.o
install:
- cp libmunix.so $(LIBDIR)
+ cp libmunix.so $(DESTDIR)$(LIBDIR)
test:
gcc -O2 -o sieve sieve.c
--- mosml/src/dynlibs/Makefile.install 2003-10-17 19:03:49.000000000 +0200
+++ mosml/src/dynlibs/Makefile 2003-10-17 20:00:12.000000000 +0200
@@ -1,6 +1,6 @@
all:
- cd interface; make
+# cd interface; make
cd intinf; make
cd mgd; make
cd mgdbm; make
@@ -21,7 +21,7 @@
cd munix; make install
test:
- cd interface; make test
+# cd interface; make test
cd intinf; make test
cd mgd; make test
cd mgdbm; make test
@@ -32,7 +32,7 @@
clean:
cd crypt; make clean
- cd interface; make clean
+# cd interface; make clean
cd intinf; make clean
cd mgd; make clean
cd mgdbm; make clean
--- mosml/src/launch/Makefile.install 2003-10-17 18:32:49.000000000 +0200
+++ mosml/src/launch/Makefile 2003-10-17 18:39:55.000000000 +0200
@@ -13,13 +13,13 @@
cat testprog) > /tmp/testscr
chmod a+x /tmp/testscr
sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
- then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
- else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \
+ then echo "#!$(BINDIR)/camlrunm" > $(DESTDIR)$(LIBDIR)/header; \
+ else ${INSTALL_PROGRAM} camlexec$(EXE) $(DESTDIR)$(LIBDIR)/header; \
fi'
rm -f /tmp/testscr
for script in mosml mosmlc mosmllex; do \
- ${INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
- chmod a+x $(BINDIR)/$$script; \
+ ${INSTALL_SCRIPT} $$script $(DESTDIR)$(BINDIR)/$$script; \
+ chmod a+x $(DESTDIR)/$(BINDIR)/$$script; \
done
mosml: mosml.tpl
--- mosml/src/lex/Makefile.install 2003-10-17 18:58:14.000000000 +0200
+++ mosml/src/lex/Makefile 2003-10-17 18:58:25.000000000 +0200
@@ -37,7 +37,7 @@
cd test; make clean
install:
- ${INSTALL_DATA} mosmllex $(LIBDIR)
+ ${INSTALL_DATA} mosmllex $(DESTDIR)$(LIBDIR)
Grammar.sml Grammar.sig: Grammar.grm
$(MOSMLYACC) Grammar.grm
--- mosml/src/mosmllib/Makefile.install 2003-10-17 18:52:05.000000000 +0200
+++ mosml/src/mosmllib/Makefile 2003-10-17 18:55:03.000000000 +0200
@@ -39,14 +39,14 @@
rm -f Vector.sml Word.sml Word8Array.sml Word8Vector.sml Weak.sml
install:
- ${INSTALL_DATA} README $(LIBDIR)
- ${INSTALL_DATA} *.ui $(LIBDIR)
- ${INSTALL_DATA} *.uo $(LIBDIR)
- ${INSTALL_DATA} *.sig $(LIBDIR)
- ${INSTALL_DATA} General.fke $(LIBDIR)/General.sig
- ${INSTALL_DATA} Meta.fke $(LIBDIR)/Meta.sig
- rm -f $(LIBDIR)/camlrunm
- ln -s $(BINDIR)/camlrunm $(LIBDIR)/camlrunm
+ ${INSTALL_DATA} README $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} *.ui $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} *.uo $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} *.sig $(DESTDIR)$(LIBDIR)
+ ${INSTALL_DATA} General.fke $(DESTDIR)$(LIBDIR)/General.sig
+ ${INSTALL_DATA} Meta.fke $(DESTDIR)$(LIBDIR)/Meta.sig
+ rm -f $(DESTDIR)$(LIBDIR)/camlrunm
+ ln -s $(BINDIR)/camlrunm $(DESTDIR)$(LIBDIR)/camlrunm
depend: Array.sml FileSys.sml Help.sml Int.sml Mosml.sml Path.sml \
Process.sml Strbase.sml Vector.sml Word.sml Word8Array.sml \
--- mosml/src/mosmlpm/Makefile.install 2003-10-17 18:55:31.000000000 +0200
+++ mosml/src/mosmlpm/Makefile 2003-10-17 18:55:40.000000000 +0200
@@ -33,4 +33,4 @@
# cd test; make clean
install:
- ${INSTALL_DATA} mosmlpm $(LIBDIR)
+ ${INSTALL_DATA} mosmlpm $(DESTDIR)$(LIBDIR)
--- mosml/src/mosmlyac/Makefile.install 2003-10-17 18:50:19.000000000 +0200
+++ mosml/src/mosmlyac/Makefile 2003-10-17 19:47:46.000000000 +0200
@@ -1,6 +1,6 @@
# Unix Makefile for the parser generator.
-CFLAGS=-O -DNDEBUG
+CFLAGS=-O -DNDEBUG ${ROPT}
include ../Makefile.inc
@@ -18,7 +18,7 @@
rm -f mosmlyac$(EXE)
install:
- ${INSTALL_PROGRAM} mosmlyac$(EXE) $(BINDIR)/mosmlyac$(EXE)
+ ${INSTALL_PROGRAM} mosmlyac$(EXE) $(DESTDIR)$(BINDIR)/mosmlyac$(EXE)
depend:
--- mosml/src/runtime/Makefile.install 2003-10-17 19:48:07.000000000 +0200
+++ mosml/src/runtime/Makefile 2003-10-17 19:47:51.000000000 +0200
@@ -1,7 +1,7 @@
# Makefile for the Moscow ML 2.00 version of the Caml Light runtime system
OPTS=-fno-defer-pop -fomit-frame-pointer -DTHREADED
-BASECFLAGS= -Dunix -O2 $(OPTS)
+BASECFLAGS= -Dunix -O2 $(OPTS) ${ROPT}
BASELIBS=-lm
@@ -29,7 +29,7 @@
PRIMS=$(BASEPRIMS) $(ADDPRIMS)
OBJS=$(BASEOBJS) $(ADDOBJS)
LIBS=$(BASELIBS) $(ADDRUNLIBS)
-CFLAGS=$(BASECFLAGS) $(ADDRUNCFLAGS)
+CFLAGS=$(BASECFLAGS) $(ADDRUNCFLAGS) $(ROPT)
all: camlrunm$(EXE)
@@ -46,7 +46,7 @@
rm -f .debugobj/*.o
install:
- ${INSTALL_PROGRAM} camlrunm$(EXE) $(BINDIR)
+ ${INSTALL_PROGRAM} camlrunm$(EXE) $(DESTDIR)$(BINDIR)
${INSTALL_PROGRAM} *.h $(INCDIR)
primitives : $(PRIMS)
--- mosml/src/Makefile.install 2003-10-17 18:59:43.000000000 +0200
+++ mosml/src/Makefile 2003-10-17 19:01:01.000000000 +0200
@@ -45,8 +45,8 @@
# Install the Mosml system
install:
- test -d $(BINDIR) || mkdir -p $(BINDIR)
- test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+ test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
+ test -d $(DESTDIR)$(LIBDIR) || mkdir -p $(DESTDIR)$(LIBDIR)
test -d $(INCDIR) || mkdir -p $(INCDIR)
test -d $(DOCDIR) || mkdir -p $(DOCDIR)
test -d $(TOOLDIR) || mkdir -p $(TOOLDIR)
mosml-ld.patch:
--- NEW FILE mosml-ld.patch ---
--- mosml.orig/src/dynlibs/crypt/Makefile.ld 2006-05-01 00:34:32.000000000 +0200
+++ mosml.orig/src/dynlibs/crypt/Makefile 2006-05-01 00:42:16.000000000 +0200
@@ -13,7 +13,7 @@
$(CC) $(CFLAGS) -c -o crypt.o crypt.c
libcrypt.so: crypt.o
- $(DYNLD) -lcrypt -o libcrypt.so crypt.o
+ $(DYNLD) -soname libcrypt.so -lc -lcrypt -o libcrypt.so crypt.o
# $(DYNLD) -o libcrypt.so crypt.o
clean:
--- mosml.orig/src/dynlibs/intinf/Makefile.ld 2006-05-01 00:35:22.000000000 +0200
+++ mosml.orig/src/dynlibs/intinf/Makefile 2006-05-01 00:42:12.000000000 +0200
@@ -25,7 +25,7 @@
$(CC) $(CFLAGS) -c -o intinf.o intinf.c
libmgmp.so: intinf.o
- $(DYNLD) -o libmgmp.so intinf.o /usr/lib/libgmp.so
+ $(DYNLD) -soname libmgmp.so -o libmgmp.so intinf.o -lc -lgmp
test:
mosml testintinf.sml
--- mosml.orig/src/dynlibs/mgd/Makefile.ld 2006-05-01 00:36:06.000000000 +0200
+++ mosml.orig/src/dynlibs/mgd/Makefile 2006-05-01 00:42:31.000000000 +0200
@@ -24,7 +24,7 @@
$(CC) $(CFLAGS) -c -o mgd.o mgd.c
libmgd.so: mgd.o
- $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
+ $(DYNLD) -soname libmgd.so -o libmgd.so mgd.o -lc -lgd -lpng -lz
# $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -R/pack/libs/lib -L/pack/libs/lib -lpng -lz
test: Graphs.uo
--- mosml.orig/src/dynlibs/mgdbm/Makefile.ld 2006-05-01 00:36:51.000000000 +0200
+++ mosml.orig/src/dynlibs/mgdbm/Makefile 2006-05-01 00:42:23.000000000 +0200
@@ -23,7 +23,7 @@
$(CC) $(CFLAGS) -c -o mgdbm.o mgdbm.c
libmgdbm.so: mgdbm.o
- $(DYNLD) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.so
+ $(DYNLD) -soname libmgdbm.so -o libmgdbm.so mgdbm.o -lc -lgdbm
test:
mosml -P full testgdbm.sml
--- mosml.orig/src/dynlibs/mpq/Makefile.ld 2006-05-01 00:37:40.000000000 +0200
+++ mosml.orig/src/dynlibs/mpq/Makefile 2006-05-01 00:42:36.000000000 +0200
@@ -34,7 +34,7 @@
libmpq.so: mpq.o
# Some recent Linux distributions need this:
- $(DYNLD) -lcrypt -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
+ $(DYNLD) -soname libmpq.so -lcrypt -o libmpq.so mpq.o -lc -lpq
# $(DYNLD) -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
install:
--- mosml.orig/src/dynlibs/mregex/Makefile.ld 2006-05-01 00:38:30.000000000 +0200
+++ mosml.orig/src/dynlibs/mregex/Makefile 2006-05-01 00:42:43.000000000 +0200
@@ -21,7 +21,7 @@
libmregex.so: mregex.o
(cd regex-0.12; ./configure; make regex.o)
- $(DYNLD) -o libmregex.so regex-0.12/regex.o mregex.o
+ $(DYNLD) -soname libmregex.so -o libmregex.so regex-0.12/regex.o mregex.o -lc
install:
cp libmregex.so $(DESTDIR)$(LIBDIR)
--- mosml.orig/src/dynlibs/munix/Makefile.ld 2006-05-01 00:39:29.000000000 +0200
+++ mosml.orig/src/dynlibs/munix/Makefile 2006-05-01 00:42:47.000000000 +0200
@@ -19,7 +19,7 @@
$(CC) $(CFLAGS) -c -o munix.o munix.c
libmunix.so: munix.o
- $(DYNLD) -o libmunix.so munix.o
+ $(DYNLD) -soname libmunix.so -o libmunix.so munix.o -lc
install:
cp libmunix.so $(DESTDIR)$(LIBDIR)
mosml-shared.patch:
--- NEW FILE mosml-shared.patch ---
--- mosml/src/dynlibs/intinf/Makefile.shared 2006-04-25 23:27:22.000000000 +0200
+++ mosml/src/dynlibs/intinf/Makefile 2006-04-25 23:27:30.000000000 +0200
@@ -25,7 +25,7 @@
$(CC) $(CFLAGS) -c -o intinf.o intinf.c
libmgmp.so: intinf.o
- $(DYNLD) -o libmgmp.so intinf.o /usr/lib/libgmp.a
+ $(DYNLD) -o libmgmp.so intinf.o /usr/lib/libgmp.so
test:
mosml testintinf.sml
--- mosml/src/dynlibs/mgdbm/Makefile.shared 2006-04-25 23:26:21.000000000 +0200
+++ mosml/src/dynlibs/mgdbm/Makefile 2006-04-25 23:26:34.000000000 +0200
@@ -23,7 +23,7 @@
$(CC) $(CFLAGS) -c -o mgdbm.o mgdbm.c
libmgdbm.so: mgdbm.o
- $(DYNLD) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.a
+ $(DYNLD) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.so
test:
mosml -P full testgdbm.sml
--- mosml/src/dynlibs/mregex/regex-0.12/Makefile.in.shared 2006-04-25 23:25:54.000000000 +0200
+++ mosml/src/dynlibs/mregex/regex-0.12/Makefile.in 2006-04-25 23:26:08.000000000 +0200
@@ -31,7 +31,7 @@
include ../../../Makefile.inc
# Likewise, you can override CFLAGS to optimize, use -Wall, etc.
-CFLAGS = -O2 $(ADDDYNLIBCFLAGS)
+CFLAGS = -O2 $(ADDDYNLIBCFLAGS) -fPIC
# Ditto for LDFLAGS and LOADLIBES.
LDFLAGS =
--- NEW FILE mosml.spec ---
Name: mosml
Version: 2.01
Release: 9%{?dist}
Summary: Moscow ML
Group: Development/Languages
License: GPL/ATT/INRIA/Distributable
URL: http://www.dina.kvl.dk/~sestoft/mosml.html
Source: http://www.dina.kvl.dk/~sestoft/mosml/mos201src.tar.gz
Patch0: mosml-install.patch
Patch1: mosml-fpic.patch
Patch2: mosml-shared.patch
Patch3: mosml-ld.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gdbm-devel
BuildRequires: gmp-devel
BuildRequires: libpng-devel
BuildRequires: gd-devel
BuildRequires: zlib-devel
BuildRequires: postgresql-devel
ExcludeArch: x86_64
%define mosmldir %{_libdir}/mosml
%description
Moscow ML provides a light-weight implementation of full Standard ML,
including Modules and some extensions. Standard ML is a strict
functional language widely used in teaching and research.
%package devel
Summary: Development files for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description devel
Development files for Moscow ML.
Install this if you want to compile native modules.
%package docs
Summary: Documentation for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description docs
Documentation for Moscow ML.
%package examples
Summary: Examples for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description examples
Examples for Moscow ML.
# %package mysql
# Summary: MySQL module for Moscow ML
# Group: Development/Languages
# Requires: %{name} = %{version}-%{release}, mysql >= 0:3.23.58
# BuildRequires: mysql-devel
# %description mysql
# Module for Moscow ML for accessing MySQL databases.
%package pg
Summary: PostgreSQL module for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description pg
Binary module for Moscow ML for accessing PostgreSQL databases.
%package gd
Summary: GD module for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description gd
Binary module for Moscow ML for using GD.
%package gdbm
Summary: GDBM module for Moscow ML
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description gdbm
Binary module for Moscow ML for using GDBM.
%prep
%setup -q -n mosml
%patch0 -p1 -b .install
%patch1 -p1 -b .fpic
%patch2 -p1 -b .shared
%patch3 -p1 -b .ld
%define makeflags BINDIR=%{mosmldir}/bin LIBDIR=%{mosmldir}/lib ROPT="$RPM_OPT_FLAGS"
# Build errors in these libraries, disable for now
perl -pi -e 's|cd mmysql.*|true|' src/dynlibs/Makefile
perl -pi -e 's|cd msocket.*|true|' src/dynlibs/Makefile
perl -pi -e 's|\${HOME}/mosml|%{_libdir}/mosml|' tools/Makefile.stub
find . -name \*.sml | xargs chmod 0644
# remove empty file
rm -f examples/units/Evaluate.sm
%build
cd src
make %makeflags MOSMLHOME=$RPM_BUILD_ROOT%{mosmldir} world
mkdir -p $RPM_BUILD_ROOT%{mosmldir}/{bin,lib}
make %makeflags MOSMLHOME=$RPM_BUILD_ROOT%{mosmldir} DESTDIR=$RPM_BUILD_ROOT install
cd dynlibs
make MOSMLHOME=$RPM_BUILD_ROOT%{mosmldir}
%install
rm -rf $RPM_BUILD_ROOT
pushd src
make %makeflags MOSMLHOME=$RPM_BUILD_ROOT%{mosmldir} DESTDIR=$RPM_BUILD_ROOT install
pushd dynlibs
make %makeflags MOSMLHOME=$RPM_BUILD_ROOT%{mosmldir} DESTDIR=$RPM_BUILD_ROOT install
popd
popd
cp tools/Makefile.stub $RPM_BUILD_ROOT%{mosmldir}/tools
# remove w32 readmes and makefiles
find examples -name "*.w32" | xargs rm -f
# Put installed doc in an rpm manner
cp -a $RPM_BUILD_ROOT%{mosmldir}/doc .
rm -rf $RPM_BUILD_ROOT%{mosmldir}/doc
# Link binaries to the standard search path /usr/bin
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cd $RPM_BUILD_ROOT%{mosmldir}/bin
for x in *
do
ln -sf ../%{_lib}/mosml/bin/$x $RPM_BUILD_ROOT%{_bindir}/$x
done
# Fix minor install problem:
rm -f $RPM_BUILD_ROOT%{mosmldir}/lib/camlrunm
ln -s ../bin/camlrunm $RPM_BUILD_ROOT%{mosmldir}/lib/camlrunm
# move include files to %%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/mosml
mv $RPM_BUILD_ROOT%{_libdir}/mosml/include $RPM_BUILD_ROOT%{_includedir}/mosml
mv $RPM_BUILD_ROOT%{_libdir}/mosml/config $RPM_BUILD_ROOT%{_includedir}/mosml
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{mosmldir}
%{_bindir}/*
#%exclude %{_libdir}/mosml/lib/Mysql.*
#%exclude %{_libdir}/mosml/lib/libmmysql.so
%exclude %{mosmldir}/lib/libmpq.so
%exclude %{mosmldir}/lib/libmgdbm.so
%exclude %{mosmldir}/lib/libmgd.so
%doc README copyrght/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%files examples
%defattr(-,root,root,-)
%doc examples/*
%files pg
%defattr(-,root,root,-)
%{mosmldir}/lib/libmpq.so
%files gdbm
%defattr(-,root,root,-)
%{mosmldir}/lib/libmgdbm.so
%files gd
%defattr(-,root,root,-)
%{mosmldir}/lib/libmgd.so
%files docs
%defattr(-,root,root,-)
%doc doc/*
%changelog
* Fri Jul 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.01-9
- fixed links to lib dir
* Mon May 1 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.01-8
- sanitized shared library linking (mosml-ld.patch)
- split off docs package
* Tue Jan 3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.01-5
- separated devel package for native module development
- added gd-devel buildreq
* Thu Feb 24 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:2.01-1
- New Version 2.01
* Wed Oct 15 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:2.00-0.fdr.1
- First Fedora release
* Mon Aug 7 2000 Jakob Lichtenberg <jl at itu.dk>
- re-build with new mos20src distribution (same version!)
* Fri Jun 30 2000 Jakob Lichtenberg <jl at itu.dk>
- initial release
--- NEW FILE sources ---
74aaaf988201fe92a9dbfbcb1e646f70 mos201src.tar.gz
- Previous message: rpms/opencv/FC-6 .cvsignore, 1.3, 1.4 opencv.spec, 1.12, 1.13 sources, 1.3, 1.4
- Next message: rpms/mosml/FC-6 Makefile, NONE, 1.1 mosml-fpic.patch, NONE, 1.1 mosml-install.patch, NONE, 1.1 mosml-ld.patch, NONE, 1.1 mosml-shared.patch, NONE, 1.1 mosml.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list