diff options
| author | Scott Mace <smace@FreeBSD.org> | 1998-09-22 21:53:47 +0000 |
|---|---|---|
| committer | Scott Mace <smace@FreeBSD.org> | 1998-09-22 21:53:47 +0000 |
| commit | c4ef5eaa78b8a7873fa2acfaca02652c5efabd94 (patch) | |
| tree | 7b60a252d8db02cae6f8fff232b8ed098bd83ebb /devel | |
| parent | Convert to ELF. (diff) | |
Convert to ELF.
round aout shared MINOR to 3.
Notes
Notes:
svn path=/head/; revision=13332
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libslang/files/patch-ad | 53 |
1 files changed, 45 insertions, 8 deletions
diff --git a/devel/libslang/files/patch-ad b/devel/libslang/files/patch-ad index d65504de3b80..ef8ddd3c7960 100644 --- a/devel/libslang/files/patch-ad +++ b/devel/libslang/files/patch-ad @@ -1,6 +1,24 @@ ---- configure.orig Sun May 17 18:49:16 1998 -+++ configure Sun May 17 18:50:22 1998 -@@ -1505,19 +1505,10 @@ +--- configure.orig Fri Apr 24 01:16:57 1998 ++++ configure Tue Sep 22 16:11:04 1998 +@@ -1489,35 +1489,25 @@ + + echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 + echo "configure:1492: checking SLANG_VERSION" >&5 +-slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | +- awk '{ print $3 }'` +-slang_major_version=`echo $slang_version | +- awk '{ print int($1/10000) }'` +-slang_minor_version=`echo $slang_version $slang_major_version | +- awk '{ print int(($1 - $2*10000)/100) }'` +-slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | +- awk '{ print ($1 - $2*10000 - $3*100) }'` +- +-slang_minor_version=$slang_minor_version.$slang_mminor_version ++slang_major_version=1 ++slang_minor_version=3 + echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6 + + @@ -9,18 +27,37 @@ - ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC" - ELF_LINK="gcc -shared -Wl,-soname#" - ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)" --else ++if [ $PORTOBJFORMAT = elf ]; then ++ELF_CC="\$(CC)" ++ELF_CFLAGS="\$(CFLAGS) -fPIC" ++ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)" ++ELF_LINK_CMD="\$(ELF_LINK)" + else - ELF_CC="cc" - ELF_CFLAGS="-K pic" - ELF_LINK="ld -G -z text" - ELF_LINK_CMD="\$(ELF_LINK)" --fi -- -- +ELF_CC="\$(CC)" +ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ELF_LINK="\$(CC) -shared -Wl,-x" ++ELF_LINK="ld -Bshareable -x" +ELF_LINK_CMD="\$(ELF_LINK)" + fi +- +- + + + +--- src/Makefile.in Fri Apr 24 01:17:04 1998 ++++ /tmp/Makefile.in Tue Sep 22 15:45:26 1998 +@@ -68,7 +68,11 @@ + ELFLIB = lib$(THIS_LIB).so# + ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# ++.if ${PORTOBJFORMAT} == elf ++ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# ++.else + ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)# ++.endif + ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# |