File mosml-dynlibs.patch of Package mosml

Overview Repositories Revisions Requests Users Attributes Meta

File mosml-dynlibs.patch of Package mosml

--- /dev/null
+++ mosml/src/dynlibs/Makefile.inc
@@ -0,0 +1,6 @@
+MOSMLINCDIR=../../../include
+MOSMLTOOLS=../../camlrunm ../../tools
+MOSMLC=../../launch/mosmlc -c
+MOSMLL=../../launch/mosmlc
+MOSMLLEX=../../launch/mosmllex
+MOSMLYACC=../../mosmlyac/mosmlyac
--- src/dynlibs/mgd/Makefile.orig
+++ src/dynlibs/mgd/Makefile
@@ -24,7 +24,7 @@ mgd.o: mgd.c
 	$(CC) $(CFLAGS) -c -o mgd.o mgd.c
 
 libmgd.so: mgd.o
-	$(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/lib -lpng -lz
+	$(DYNLD) -o libmgd.so mgd.o -lgd -L/usr/lib -lpng -lz
 #	$(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
 #	$(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -R/pack/libs/lib -L/pack/libs/lib -lpng -lz
 
@@ -32,7 +32,7 @@ test: Graphs.uo
 	mosml testgdimage.sml
 
 install:
-	cp libmgd.so $(LIBDIR)
+	cp libmgd.so $(DESTDIR)$(LIBDIR)
 
 clean:
 	rm -f *.o
--- src/dynlibs/mgdbm/Makefile.orig
+++ src/dynlibs/mgdbm/Makefile
@@ -5,10 +5,10 @@
 
 # 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=${HOME}/c/gdbm-1.7.3
+#GDBMINCDIR=${HOME}/c/gdbm-1.7.3
+GDBMLIBDIR=/usr/$(ARCHLIB)
+GDBMINCDIR=/usr/include
 
 include ../../Makefile.inc
 
@@ -19,13 +19,13 @@ 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 
 
 libmgdbm.so: mgdbm.o
-	$(DYNLD) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.a
+	$(DYNLD) $(CFLAGS) -o libmgdbm.so mgdbm.o ${GDBMLIBDIR}/libgdbm.a
 
 test:
 	mosml -P full testgdbm.sml
--- src/dynlibs/mmysql/Makefile.orig
+++ src/dynlibs/mmysql/Makefile
@@ -12,8 +12,8 @@ MYSQLINCDIR=/usr/include/mysql
 
 include ../../Makefile.inc
 
-OPTS=-fno-defer-pop
-CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
+OPTS=-fno-defer-pop -fPIC
+CFLAGS= -Dunix -O2 $(OPTS) $(RPM_OPT_FLAGS) -I$(INCDIR) -I ${MYSQLINCDIR}
 
 MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
 MOSMLC=mosmlc -c
@@ -27,11 +27,11 @@ mmysql.o: mmysql.c
 	$(CC) $(CFLAGS) -c -o mmysql.o mmysql.c
 
 libmmysql.so: mmysql.o
-	$(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient -lnsl
+	$(DYNLD) $(CFLAGS) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient -lnsl
 #	$(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
 
 install:
-	cp libmmysql.so $(LIBDIR)
+	cp libmmysql.so $(DESTDIR)$(LIBDIR)
 
 test:
 	mosml testmysql.sml
--- src/dynlibs/mmysql/mmysql.c.orig
+++ src/dynlibs/mmysql/mmysql.c
@@ -76,9 +76,9 @@ void dbresult_finalize(value dbresval)
   MYSQL_ROW_OFFSET* index = DBresultindex_val(dbresval);
   if (dbres != NULL) {
     mysql_free_result(dbres);
-    DBresult_val(dbresval) = NULL;
+    dbres = NULL;
     stat_free((char*)index);
-    DBresultindex_val(dbresval) = NULL;
+    index = NULL;
   }
 }
 
--- src/dynlibs/mpq/Makefile.orig
+++ src/dynlibs/mpq/Makefile
@@ -7,10 +7,10 @@
 # Note: Unix distributions vary widely in the PGSQLLIBDIR 
 #       and PGSQLINCDIR locations
 
-PGSQLLIBDIR=/usr/lib
-PGSQLINCDIR=/usr/include/postgresql
 #PGSQLLIBDIR=/usr/lib
-#PGSQLINCDIR=/usr/include/pgsql
+#PGSQLINCDIR=/usr/include/postgresql
+PGSQLLIBDIR=/usr/$(ARCHLIB)
+PGSQLINCDIR=/usr/include/pgsql
 #PGSQLLIBDIR=/usr/local/pgsql/lib
 #PGSQLINCDIR=/usr/local/pgsql/include
 #PGSQLLIBDIR=/usr/lib/pgsql/lib
@@ -40,7 +40,7 @@ libmpq.so: mpq.o
 #	$(DYNLD) -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
 
 install:
-	cp libmpq.so $(LIBDIR)
+	cp libmpq.so $(DESTDIR)$(LIBDIR)
 
 test:
 	mosml testpsql.sml
--- src/dynlibs/mregex/Makefile.orig
+++ src/dynlibs/mregex/Makefile
@@ -24,7 +24,7 @@ libmregex.so: mregex.o
 	$(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

Places

File mosml-dynlibs.patch of Package mosml

Places