cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link with libdl on all ELF platforms, instead of fixing those for every

Browse Source 
case one by one; fixes alpha.  Relies on __ELF__ being predefined.
tested on i386, ppc, alpha
This commit is contained in:
pvalchev 2001-10-10 01:01:44 +00:00
parent c4ed8bcd0a
commit 7e2cbb50f7
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lang/tcl/8.3/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2001/10/08 09:21:38 matthieu Exp $
--- configure.orig Fri Apr 6 20:51:46 2001
+++ configure Sun Oct 7 02:52:49 2001
@@ -5112,13 +5112,23 @@
$OpenBSD: patch-configure,v 1.5 2001/10/10 01:01:44 pvalchev Exp $
--- configure.orig Fri Apr 6 12:51:46 2001
+++ configure Tue Oct 9 00:02:00 2001
@@ -5112,13 +5112,23 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@ -20,16 +20,16 @@ $OpenBSD: patch-configure,v 1.4 2001/10/08 09:21:38 matthieu Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
+ case `arch -s` in
+ powerpc|sparc64)
+ DL_LIBS="-ldl";;
+ *)
+ case `echo __ELF__ | gcc -E - | grep __ELF__` in
+ __ELF__)
+ DL_LIBS="";;
+ *)
+ DL_LIBS="-ldl";;
+ esac
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
@@ -5136,11 +5146,11 @@
@@ -5136,11 +5146,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@ -43,7 +43,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/08 09:21:38 matthieu Exp $
fi
rm -f conftest*
@@ -5161,7 +5171,10 @@
@@ -5161,7 +5171,10 @@ else
fi
@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/08 09:21:38 matthieu Exp $
# FreeBSD doesn't handle version numbers with dots.
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -5848,10 +5861,9 @@
@@ -5848,10 +5861,9 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
@ -67,7 +67,7 @@ $OpenBSD: patch-configure,v 1.4 2001/10/08 09:21:38 matthieu Exp $
fi
else
case $system in
@@ -5935,7 +5947,7 @@
@@ -5935,7 +5947,7 @@ eval "STUB_LIB_FILE=libtclstub${TCL_UNSH
# Replace DBGX with TCL_DBGX
eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""

12
x11/tk/8.3/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2001/09/08 18:20:29 pvalchev Exp $
$OpenBSD: patch-configure,v 1.4 2001/10/10 01:01:45 pvalchev Exp $
--- configure.orig Thu Apr 5 20:03:05 2001
+++ configure Fri Aug 3 23:27:46 2001
+++ configure Tue Oct 9 00:00:43 2001
@@ -1868,13 +1868,23 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@ -20,11 +20,11 @@ $OpenBSD: patch-configure,v 1.3 2001/09/08 18:20:29 pvalchev Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
+ case `arch -s` in
+ powerpc)
+ DL_LIBS="-ldl";;
+ *)
+ case `echo __ELF__ | gcc -E - | grep __ELF__` in
+ __ELF__)
+ DL_LIBS="";;
+ *)
+ DL_LIBS="-ldl";;
+ esac
LDFLAGS=""
LD_SEARCH_FLAGS=""