- Link with -ldl on all ELF platforms

- Rename patches while here
This commit is contained in:
pvalchev 2001-10-10 04:17:40 +00:00
parent 7e2cbb50f7
commit 31d940450e
2 changed files with 18 additions and 16 deletions

View File

@ -1,6 +1,7 @@
--- Makefile.in.orig Tue Mar 9 06:51:26 1999
+++ Makefile.in Tue Feb 27 09:31:10 2001
@@ -34,6 +34,9 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/10/10 04:17:40 pvalchev Exp $
--- Makefile.in.orig Mon Mar 8 23:51:26 1999
+++ Makefile.in Tue Oct 9 21:51:56 2001
@@ -34,6 +34,9 @@ exec_prefix = @exec_prefix@
# when installing files.
INSTALL_ROOT =
@ -10,7 +11,7 @@
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TCL_LIBRARY environment variable at
# run-time to override this value):
@@ -331,14 +334,18 @@
@@ -331,14 +334,18 @@ DL_SRCS = \
SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
@ -31,7 +32,7 @@
# Make target which outputs the list of the .o contained in the Tcl lib
# usefull to build a single big shared library containing Tcl and other
@@ -433,7 +440,7 @@
@@ -433,7 +440,7 @@ install: install-binaries install-librar
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -40,7 +41,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -445,16 +452,19 @@
@@ -445,16 +452,19 @@ install-binaries: $(TCL_LIB_FILE) tclsh
done;
@echo "Installing $(TCL_LIB_FILE)"
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@ -64,7 +65,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -472,8 +482,15 @@
@@ -472,8 +482,15 @@ install-libraries:
else true; \
fi; \
done;
@ -82,7 +83,7 @@
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
echo "Installing $$i"; \
@@ -525,6 +542,13 @@
@@ -525,6 +542,13 @@ install-man:
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)

View File

@ -1,6 +1,7 @@
--- configure.orig Tue Mar 9 01:51:26 1999
+++ configure Wed Mar 7 20:55:25 2001
@@ -4095,16 +4095,26 @@
$OpenBSD: patch-configure,v 1.1 2001/10/10 04:17:40 pvalchev Exp $
--- configure.orig Mon Mar 8 23:51:26 1999
+++ configure Tue Oct 9 21:51:56 2001
@@ -4095,16 +4095,26 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@ -19,11 +20,11 @@
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
LD_FLAGS=""
LD_SEARCH_FLAGS=""
@ -32,7 +33,7 @@
else
echo "$ac_t""no" 1>&6
@@ -4656,10 +4666,9 @@
@@ -4656,10 +4666,9 @@ if test "$tcl_ok" = "yes" -a "${SHLIB_SU
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
if test "x$DL_OBJS" = "xtclLoadAout.o"; then