summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-09-27 20:13:16 +0000
committerSteve Price <steve@FreeBSD.org>1998-09-27 20:13:16 +0000
commit7c46996f8a56a45975f8cacef49645b26cd5ad00 (patch)
tree6424f9fff7b7d35c0bf23c33e28cdb33a884bca8 /math
parentDid this ever build? :) Mark it broken until we figure out why. (diff)
Convert to ELF.
Notes
Notes: svn path=/head/; revision=13463
Diffstat (limited to 'math')
-rw-r--r--math/bihar/pkg-plist7
-rw-r--r--math/eispack/pkg-plist7
-rw-r--r--math/fftpack/pkg-plist7
-rw-r--r--math/lapack/Makefile11
-rw-r--r--math/lapack/pkg-plist10
-rw-r--r--math/librandlib/pkg-plist7
-rw-r--r--math/libranlib/pkg-plist7
-rw-r--r--math/linpack/pkg-plist7
-rw-r--r--math/plplot/Makefile9
-rw-r--r--math/plplot/files/patch-aa20
-rw-r--r--math/plplot/files/patch-ac13
-rw-r--r--math/plplot/pkg-plist3
-rw-r--r--math/randlib/pkg-plist7
-rw-r--r--math/simpack/Makefile38
-rw-r--r--math/simpack/pkg-plist10
15 files changed, 113 insertions, 50 deletions
diff --git a/math/bihar/pkg-plist b/math/bihar/pkg-plist
index 189e233af115..6151d6fd3ca8 100644
--- a/math/bihar/pkg-plist
+++ b/math/bihar/pkg-plist
@@ -1,6 +1,7 @@
lib/libbihar.a
-lib/libbihar.so.1.0
+lib/libbihar.so
+lib/libbihar.so.1
share/doc/fftpack/fft.doc.gz
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm share/doc/fftpack
diff --git a/math/eispack/pkg-plist b/math/eispack/pkg-plist
index 4655f81510a5..63aad1e7db18 100644
--- a/math/eispack/pkg-plist
+++ b/math/eispack/pkg-plist
@@ -1,4 +1,5 @@
lib/libeispack.a
-lib/libeispack.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libeispack.so
+lib/libeispack.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/math/fftpack/pkg-plist b/math/fftpack/pkg-plist
index 189e233af115..6151d6fd3ca8 100644
--- a/math/fftpack/pkg-plist
+++ b/math/fftpack/pkg-plist
@@ -1,6 +1,7 @@
lib/libbihar.a
-lib/libbihar.so.1.0
+lib/libbihar.so
+lib/libbihar.so.1
share/doc/fftpack/fft.doc.gz
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm share/doc/fftpack
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 567c9c01694a..caa193bada9c 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -3,7 +3,7 @@
# Date created: 2 July 1994
# Whom: jmz
#
-# $Id: Makefile,v 1.7 1998/08/24 19:48:10 jmz Exp $
+# $Id: Makefile,v 1.8 1998/08/25 02:26:19 asami Exp $
#
DISTNAME= LAPACK
@@ -184,7 +184,14 @@ MANL= cgbmv.l cgemm.l cgemv.l cgerc.l cgeru.l chbmv.l chemm.l chemv.l \
do-install:
${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.* ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/SRC/liblapack.* ${PREFIX}/lib
- ${LDCONFIG} -m ${PREFIX}/lib
+ if [ "${PORTOBJFORMAT}" = "elf" ]; then \
+ ${LN} -sf libblas.so.2 ${PREFIX}/lib/libblas.so; \
+ ${LN} -sf liblapack.so.2 ${PREFIX}/lib/liblapack.so; \
+ else \
+ ${LN} -sf libblas.so.2.0 ${PREFIX}/lib/libblas.so; \
+ ${LN} -sf liblapack.so.2.0 ${PREFIX}/lib/liblapack.so; \
+ fi
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
${INSTALL_MAN} ${WRKDIR}/blas/man/manl/*.l ${PREFIX}/man/manl
${INSTALL_MAN} ${WRKDIR}/man/manl/*.l ${PREFIX}/man/manl
diff --git a/math/lapack/pkg-plist b/math/lapack/pkg-plist
index 547a4f4f9ba4..b2bb954f0d66 100644
--- a/math/lapack/pkg-plist
+++ b/math/lapack/pkg-plist
@@ -1,6 +1,8 @@
lib/libblas.a
-lib/libblas.so.2.0
+lib/libblas.so
+lib/libblas.so.2
lib/liblapack.a
-lib/liblapack.so.2.0
-@exec ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/liblapack.so
+lib/liblapack.so.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/math/librandlib/pkg-plist b/math/librandlib/pkg-plist
index 9527c6a423ae..e900c337202b 100644
--- a/math/librandlib/pkg-plist
+++ b/math/librandlib/pkg-plist
@@ -1,8 +1,9 @@
include/ranlib.h
lib/libranlib.a
-lib/libranlib.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libranlib.so
+lib/libranlib.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/doc/ranlib/Basegen.c.doc
share/doc/ranlib/ranlib.c.chs
share/doc/ranlib/ranlib.c.fdoc
diff --git a/math/libranlib/pkg-plist b/math/libranlib/pkg-plist
index 9527c6a423ae..e900c337202b 100644
--- a/math/libranlib/pkg-plist
+++ b/math/libranlib/pkg-plist
@@ -1,8 +1,9 @@
include/ranlib.h
lib/libranlib.a
-lib/libranlib.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libranlib.so
+lib/libranlib.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/doc/ranlib/Basegen.c.doc
share/doc/ranlib/ranlib.c.chs
share/doc/ranlib/ranlib.c.fdoc
diff --git a/math/linpack/pkg-plist b/math/linpack/pkg-plist
index 37d1f8b9237e..05285dc6f145 100644
--- a/math/linpack/pkg-plist
+++ b/math/linpack/pkg-plist
@@ -1,4 +1,5 @@
lib/liblinpack.a
-lib/liblinpack.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/liblinpack.so
+lib/liblinpack.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index f19e0049f1d8..1a5f28b022e1 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -3,7 +3,7 @@
# Date created: 03 Oct 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.3 1997/11/30 21:12:15 jseger Exp $
+# $Id: Makefile,v 1.4 1997/12/24 01:21:31 alex Exp $
#
DISTNAME= plplot4p99j
@@ -20,4 +20,11 @@ post-patch:
@perl -pi.bak -e "s|/usr/local/plplot/lib|${PREFIX}/lib/plplot|g;" \
${WRKSRC}/src/plctrl.c
+post-install:
+ if [ "${PORTOBJFORMAT}" = "elf" ]; then \
+ ${LN} -sf libplplotdX.so.4 ${PREFIX}/lib/libplplotdX.so; \
+ else \
+ ${LN} -sf libplplotdX.so.4.99 ${PREFIX}/lib/libplplotdX.so; \
+ fi
+
.include <bsd.port.mk>
diff --git a/math/plplot/files/patch-aa b/math/plplot/files/patch-aa
index 95be93460cde..341419dd1e15 100644
--- a/math/plplot/files/patch-aa
+++ b/math/plplot/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig Tue Jun 6 21:58:50 1995
-+++ configure Fri Oct 3 14:59:52 1997
+--- configure.orig Tue Jun 6 14:58:50 1995
++++ configure Sat Sep 26 23:34:48 1998
@@ -1472,13 +1472,13 @@
# ----------------------------------------------------------------------------
@@ -17,22 +17,28 @@
LDC_FLAGS=\
"$PROF_FLAG_LC $SYS_FLAGS_LC $DEBUG_FLAG_LC"
-@@ -3062,6 +3062,14 @@
+@@ -3062,6 +3062,20 @@
# Hmm, would be good to replace that trailing .0 with the
# compilation number or some such. Have to think about that.
;;
+ FreeBSD*|NetBSD*|OpenBSD* )
-+ SO='.so.$(MAJOR_VERSION).$(MINOR_VERSION)'
+ SHLIB_CCFLAGS="-fpic -DPIC"
+ SHLIB_CXXFLAGS="-fpic -DPIC"
-+ SHLIB_BUILD="ld -Bshareable -o"
-+ SOVERSION='$(MAJOR_VERSION).$(MINOR_VERSION)'
++ if [ "${PORTOBJFORMAT}" = "elf" ]; then
++ SO='.so.$(MAJOR_VERSION)'
++ SHLIB_BUILD="ld -shared -soname \$@ -o"
++ SOVERSION='$(MAJOR_VERSION)'
++ else
++ SO='.so.$(MAJOR_VERSION).$(MINOR_VERSION)'
++ SHLIB_BUILD="ld -Bshareable -o"
++ SOVERSION='$(MAJOR_VERSION).$(MINOR_VERSION)'
++ fi
+ echo "$ac_t""okay" 1>&6
+ ;;
HP-UX-* )
SO=".sl"
SHLIB_F77FLAGS="+z"
-@@ -4192,16 +4200,16 @@
+@@ -4192,16 +4206,16 @@
fi
fi
if test -z "$DOC_DIR"; then
diff --git a/math/plplot/files/patch-ac b/math/plplot/files/patch-ac
new file mode 100644
index 000000000000..d2bc00e8b1ac
--- /dev/null
+++ b/math/plplot/files/patch-ac
@@ -0,0 +1,13 @@
+--- drivers/tek.c.orig Sat Sep 26 23:07:07 1998
++++ drivers/tek.c Sat Sep 26 23:07:28 1998
+@@ -79,8 +79,8 @@
+ static void tty_atexit (void);
+ #else
+ static void tty_setup (void) {};
+-static int tty_cbreak (void) {return 0};
+-static int tty_reset (void) {return 0};
++static int tty_cbreak (void) {return 0;};
++static int tty_reset (void) {return 0;};
+ static void tty_atexit (void) {};
+ #endif
+
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index 56e7bc94de34..9917717261de 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -10,7 +10,10 @@ include/plplot/plplot.h
include/plplot/plplotP.h
include/plplot/plstream.h
lib/libplplotdX.a
+lib/libplplotdX.so
lib/libplplotdX.so.4.99
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/plplot/usaglobe.map
lib/plplot/usa.map
lib/plplot/globe.map
diff --git a/math/randlib/pkg-plist b/math/randlib/pkg-plist
index 9527c6a423ae..e900c337202b 100644
--- a/math/randlib/pkg-plist
+++ b/math/randlib/pkg-plist
@@ -1,8 +1,9 @@
include/ranlib.h
lib/libranlib.a
-lib/libranlib.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libranlib.so
+lib/libranlib.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/doc/ranlib/Basegen.c.doc
share/doc/ranlib/ranlib.c.chs
share/doc/ranlib/ranlib.c.fdoc
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index 4fb4207b3582..9a0b9f30ee78 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 June 1997
# Whom: Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>
#
-# $Id: Makefile,v 1.1.1.1 1997/06/10 08:50:17 asami Exp $
+# $Id: Makefile,v 1.2 1997/07/13 18:49:24 max Exp $
#
DISTNAME= simpack-3.0
@@ -52,11 +52,11 @@ do-install-lib:
${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/lib/SimPack/$$i ; \
done
@${INSTALL_DATA} ${WRKDIR}/temp/libsim++.a ${PREFIX}/lib/libsim++.a
- @${INSTALL_DATA} ${WRKDIR}/temp/libsim++.so.1.0 \
- ${PREFIX}/lib/libsim++.so.1.0
+ @${INSTALL_DATA} ${WRKDIR}/temp/libsim++.so.${VERSION} ${PREFIX}/lib
+ @${LN} -sf libsim++.so.${VERSION} ${PREFIX}/lib/libsim++.so
@${INSTALL_DATA} ${WRKDIR}/temp/libqueuing.a ${PREFIX}/lib/libqueuing.a;
- @${INSTALL_DATA} ${WRKDIR}/temp/libqueuing.so.1.0 \
- ${PREFIX}/lib/libqueuing.so.1.0
+ @${INSTALL_DATA} ${WRKDIR}/temp/libqueuing.so.${VERSION} ${PREFIX}/lib
+ @${LN} -sf libqueuing.so.${VERSION} ${PREFIX}/lib/libqueuing.so
do-install-doc:
@for i in `${CAT} ${FILESDIR}/DIRS-SHARE` ; do \
@@ -78,15 +78,20 @@ create-lib-sim++:
done; \
${AR} cq libsim++.a `lorder *.o | tsort -q `; \
${RM} *.o )
- @${ECHO} libsim++.so.1.0
+ @${ECHO} libsim++.so.${VERSION}
@(cd ${WRKDIR}/temp; \
for i in `${CAT} ${FILESDIR}/FILES-SRC-SIMPP` ; do \
gcc -fpic -DPIC -I${WRKSRC}/func/event/include -c -O \
-o `basename $$i cpp`.so \
${WRKSRC}/func/event/src/$$i ; \
done; \
- ${LD} -Bshareable -x -o libsim++.so.1.0 \
- `lorder *.so | tsort -q ` ; \
+ if [ "${PORTOBJFORMAT}" = "elf" ]; then \
+ ${LD} -shared -x -soname libsim++.so.${VERSION} -o \
+ libsim++.so.${VERSION} `lorder *.so | tsort -q ` ; \
+ else \
+ ${LD} -Bshareable -x -o libsim++.so.${VERSION} \
+ `lorder *.so | tsort -q ` ; \
+ fi; \
${RM} *.so )
create-lib-queuing:
@@ -96,13 +101,18 @@ create-lib-queuing:
${WRKSRC}/func/queuing/queuing.c; \
${AR} cq libqueuing.a `lorder *.o | tsort -q `; \
${RM} *.o )
- @${ECHO} libqueuing.so.1.0
+ @${ECHO} libqueuing.so.${VERSION}
@(cd ${WRKDIR}/temp; \
gcc -fpic -DPIC -I${WRKSRC}/func/queuing -c -O \
-o queuing.so \
${WRKSRC}/func/queuing/queuing.c ; \
- ${LD} -Bshareable -x -o libqueuing.so.1.0 \
- `lorder *.so | tsort -q ` ; \
+ if [ "${PORTOBJFORMAT}" = "elf" ]; then \
+ ${LD} -shared -x -soname libqueuing.so.${VERSION} -o \
+ libqueuing.so.${VERSION} `lorder *.so | tsort -q ` ; \
+ else \
+ ${LD} -Bshareable -x -o libqueuing.so.${VERSION} \
+ `lorder *.so | tsort -q ` ; \
+ fi; \
${RM} *.so )
create-scripts: create-sdsmt-alias create-deq-alias
@@ -122,3 +132,9 @@ create-deq-alias:
>> ${WRKDIR}/temp/deq.alias
.include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION= 1
+.else
+VERSION= 1.0
+.endif
diff --git a/math/simpack/pkg-plist b/math/simpack/pkg-plist
index 0c8b372ce9ee..015c8a4a47c2 100644
--- a/math/simpack/pkg-plist
+++ b/math/simpack/pkg-plist
@@ -32,11 +32,13 @@ lib/Sim++/olb/token.o
lib/Sim++/olb/util.o
lib/Sim++/olb/vlist.o
lib/libsim++.a
-lib/libsim++.so.1.0
+lib/libsim++.so
+lib/libsim++.so.1
lib/libqueuing.a
-lib/libqueuing.so.1.0
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+lib/libqueuing.so
+lib/libqueuing.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/SimPack/constraint/differential/deq/deq
lib/SimPack/constraint/differential/deq/order1
lib/SimPack/constraint/differential/deq/contsim