Ticket #17659: patch-src-dynlibs.diff

include/config.h

@@ -2 +2 @@
 #define _config_
 
 
-#if defined(__MWERKS__) || defined(THINK_C)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
 #include "m.h"
 #include "s.h"
 #else

src/Makefile

@@ -25 +25 @@
         cd lex; make all
         cd launch; make all
 
+world-dyn:
+        cd dynlibs/msocket; make
+        cd dynlibs/crypt; make
+        cd dynlibs/munix; make
+        cd dynlibs/mregex; make
+        cd dynlibs/mgdbm; make
+        cd dynlibs/mgd; make
+        cd dynlibs/intinf; make
+
+install-world-dyn: dirs
+        cd dynlibs/msocket; make install
+        cd dynlibs/crypt; make install
+        cd dynlibs/munix; make install
+        cd dynlibs/mregex; make install
+        cd dynlibs/mgdbm; make install
+        cd dynlibs/mgd; make install
+        cd dynlibs/intinf; make install
+
 uptodate:
         cd runtime; make all
         cp runtime/camlrunm$(EXE) .
@@ -42 +60 @@
         cd toolssrc; make clean all
         cd lex; make clean all
 
-# Install the Mosml system
-install:
+dirs:
         test -d $(BINDIR) || mkdir -p $(BINDIR)
         test -d $(LIBDIR) || mkdir -p $(LIBDIR)
         test -d $(INCDIR) || mkdir -p $(INCDIR)
         test -d $(DOCDIR) || mkdir -p $(DOCDIR)
         test -d $(TOOLDIR) || mkdir -p $(TOOLDIR)
+
+# Install the Mosml system
+install: dirs
         cd runtime; make install
         cd config; make install
         cd launch; make all install

src/Makefile.inc

@@ -30 +30 @@
 # For Linux (x86 or Alpha), use:
 # ------------------------------
 CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
-STRIP=strip
-LD=gcc -rdynamic
-DYNLD=ld -shared
+STRIP=echo
+LD=gcc -Wl,-rpath -Wl,${DESTROOT}/lib/mosml
+DYNLD=gcc -bundle -bundle_loader ${DESTROOT}/bin/camlrunm
+ADDRUNLIBS=
+ADDRUNCFLAGS=
+ADDDYNLIBCFLAGS=-DLSB
 
 # For Cygwin 20.1, use:
 # ---------------------

src/dynlibs/crypt/Makefile

@@ -13 +13 @@
         $(CC) $(CFLAGS) -c -o crypt.o crypt.c
 
 libcrypt.so: crypt.o
-        $(DYNLD) -lcrypt -o libcrypt.so crypt.o
-#       $(DYNLD)         -o libcrypt.so crypt.o
+        $(DYNLD)         -o libcrypt.so crypt.o
+
+install:
+        cp libcrypt.so $(LIBDIR)
 
 clean:
         rm -f *.o

src/dynlibs/intinf/Makefile

@@ -5 +5 @@
 
 # Where to find GMP header file and compiled library
 
-GMPDIR=${HOME}/c/gmp-2.0.2
+GMPDIR=/opt/local
+GMPINCDIR=${GMPDIR}/include
+GMPLIBDIR=${GMPDIR}/lib
 
 include ../../Makefile.inc
 
 OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPINCDIR}
 
 MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
 MOSMLC=mosmlc -c
@@ -18 +20 @@
 MOSMLLEX=mosmllex
 MOSMLYACC=mosmlyac
 
-all: libmgmp.so IntInf.uo
+all: libmgmp.so IntInf.uo IntInf.ui
 
-install:
+install: all
         cp libmgmp.so $(LIBDIR)
+        cp IntInf.uo $(LIBDIR)
+        cp IntInf.ui $(LIBDIR)
+        cp IntInf.sig $(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 ${GMPLIBDIR}/libgmp.a
 
 test:
         mosml testintinf.sml

src/dynlibs/mgd/Makefile

@@ -5 +5 @@
 
 # Where to find gd header file and compiled library
 
-GDDIR=${HOME}/c/gd-1.7.3
+GDINCDIR=/opt/local/include
+GDLIBDIR=/opt/local/lib
 
 include ../../Makefile.inc
 
 OPTS=-fno-defer-pop
-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDDIR}
+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDINCDIR}
 
 MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
 MOSMLC=mosmlc -c
@@ -24 +25 @@
         $(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) -o libmgd.so mgd.o ${GDLIBDIR}/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
 
 test: Graphs.uo

src/dynlibs/mgdbm/Makefile

@@ -5 +5 @@
 
 # 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=/opt/local/lib
+GDBMINCDIR=/opt/local/include
 
 include ../../Makefile.inc
 

src/dynlibs/munix/munix.c

@@ -59 +59 @@
     failwith("EINVAL"); break;
   case EISDIR:
     failwith("EISDIR"); break;
-  case ELIBBAD:
-    failwith("ELIBBAD"); break;
+/*  case ELIBBAD:
+    failwith("ELIBBAD"); break; */
   case ECHILD:
     failwith("ECHILD"); break;
   case EINTR:

src/runtime/config.h

@@ -2 +2 @@
 #define _config_
 
 
-#if defined(__MWERKS__) || defined(THINK_C)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
 #include "m.h"
 #include "s.h"
 #else