sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- strip SHLIB_LD of option "-soname $@"

Browse source 
- define TCL_SHLIB_LD_EXTRAS
- bump PORTREVISION

PR:		34210
This commit is contained in:
Dirk Meyer 2002-01-27 14:24:21 +00:00
parent 9bfa379481
commit 00b1bf0150
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=53843
6 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/tcl82/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tcl PORTNAME= tcl
PORTVERSION= 8.2.3 PORTVERSION= 8.2.3
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= lang tcl82 CATEGORIES= lang tcl82
MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_2 MASTER_SITE_SUBDIR= tcl8_2

26
lang/tcl82/files/patch-ab
View file

@ -1,5 +1,5 @@
--- configure.orig Tue Dec 14 22:59:18 1999 --- configure.orig Wed Dec 15 04:59:18 1999
+++ configure Wed Jan 5 00:56:06 2000 +++ configure Sun Jan 27 14:59:38 2002
@@ -4648,7 +4648,7 @@ @@ -4648,7 +4648,7 @@
EXTRA_CFLAGS="" EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX="" TCL_EXPORT_FILE_SUFFIX=""
@ -18,7 +18,7 @@
# Not available on all versions: check for include file. # Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@ -4922,16 +4922,20 @@ @@ -4922,16 +4922,21 @@
fi fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
@ -34,7 +34,8 @@
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then + if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ SHLIB_LD="ld -shared -x -soname \$@" + TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
+ else + else
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="ld -Bshareable -x"
@ -42,7 +43,7 @@
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
@@ -4954,17 +4958,6 @@ @@ -4954,17 +4959,6 @@
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots TCL_LIB_VERSIONS_OK=nodots
;; ;;
@ -60,7 +61,7 @@
NEXTSTEP-*) NEXTSTEP-*)
SHLIB_CFLAGS="" SHLIB_CFLAGS=""
SHLIB_LD="cc -nostdlib -r" SHLIB_LD="cc -nostdlib -r"
@@ -5371,7 +5364,7 @@ @@ -5371,7 +5365,7 @@
SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
fi fi
if test "$UNSHARED_LIB_SUFFIX" = "" ; then if test "$UNSHARED_LIB_SUFFIX" = "" ; then
@ -69,7 +70,16 @@
fi fi
@@ -5628,11 +5621,7 @@ @@ -5594,7 +5588,7 @@
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
else
- MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
RANLIB=":"
fi
else
@@ -5628,11 +5622,7 @@
# up the Tcl library. # up the Tcl library.
if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
@ -82,7 +92,7 @@
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
else else
@@ -5678,11 +5667,7 @@ @@ -5678,11 +5668,7 @@
TCL_STUB_LIB_FILE=${STUB_LIB_FILE} TCL_STUB_LIB_FILE=${STUB_LIB_FILE}

2
lang/tcl83/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tcl PORTNAME= tcl
PORTVERSION= 8.3.4 PORTVERSION= 8.3.4
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= lang tcl83 CATEGORIES= lang tcl83
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl MASTER_SITE_SUBDIR= tcl

7
lang/tcl83/files/patch-configure
View file

@ -1,5 +1,5 @@
--- configure.orig Sat Oct 20 02:24:15 2001 --- configure.orig Sat Oct 20 02:24:15 2001
+++ configure Sat Nov 10 20:17:05 2001 +++ configure Sun Jan 27 14:52:09 2002
@@ -4779,7 +4779,7 @@ @@ -4779,7 +4779,7 @@
EXTRA_CFLAGS="" EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX="" TCL_EXPORT_FILE_SUFFIX=""
@ -9,12 +9,13 @@
ECHO_VERSION='`echo ${VERSION}`' ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g CFLAGS_DEBUG=-g
@@ -5386,16 +5386,16 @@ @@ -5386,16 +5386,17 @@
FreeBSD-*) FreeBSD-*)
# FreeBSD 3.* and greater have ELF. # FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC" SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD="ld -Bshareable -x"
+ SHLIB_LD="ld -shared -x -soname \$@" + TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
SHLIB_LD_LIBS="" SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o" DL_OBJS="tclLoadDl.o"

1
lang/tcl84/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= tcl PORTNAME= tcl
PORTVERSION= 8.4a3 PORTVERSION= 8.4a3
PORTREVISION= 1
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl MASTER_SITE_SUBDIR= tcl

16
lang/tcl84/files/patch-configure
View file

@ -1,5 +1,5 @@
--- configure.orig Tue Aug 7 05:06:23 2001 --- configure.orig Tue Aug 7 05:06:23 2001
+++ configure Wed Nov 14 09:26:26 2001 +++ configure Sun Jan 27 14:54:59 2002
@@ -4769,7 +4769,7 @@ @@ -4769,7 +4769,7 @@
EXTRA_CFLAGS="" EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX="" TCL_EXPORT_FILE_SUFFIX=""
@ -9,12 +9,13 @@
ECHO_VERSION='`echo ${VERSION}`' ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g CFLAGS_DEBUG=-g
@@ -5300,13 +5300,16 @@ @@ -5300,13 +5300,17 @@
FreeBSD-*) FreeBSD-*)
# FreeBSD 3.* and greater have ELF. # FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC" SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD="ld -Bshareable -x"
+ SHLIB_LD="ld -shared -x -soname \$@" + TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
SHLIB_LD_LIBS="" SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so" SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o" DL_OBJS="tclLoadDl.o"
@ -28,3 +29,12 @@
;; ;;
NEXTSTEP-*) NEXTSTEP-*)
SHLIB_CFLAGS="" SHLIB_CFLAGS=""
@@ -5985,7 +5989,7 @@
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
else
- MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
RANLIB=":"
fi
else