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

fix to build broken with XF4; pointed out by naddy@ and wilfried@

Browse Source
This commit is contained in:
kevlo 2002-12-02 08:01:17 +00:00
parent 4646e01004
commit 28338b9a0d
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x11/tk/8.3/patches/patch-Makefile_in
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2002/12/02 08:01:17 kevlo Exp $
--- Makefile.in.orig Wed Oct 23 17:45:50 2002
+++ Makefile.in Fri Nov 29 17:38:11 2002
@@ -356,7 +356,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+++ Makefile.in Mon Dec 2 15:41:08 2002
@@ -203,7 +203,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
+WISH_LIBS = -L${PREFIX}/lib -ltcl83 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
@@ -356,7 +356,7 @@
all: binaries libraries doc
@ -10,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
libraries:
@@ -371,12 +371,15 @@ doc: $(SRC_DIR)/doc/man.macros
@@ -371,12 +371,15 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@ -28,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
@@ -478,12 +481,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
@@ -478,12 +481,15 @@
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -46,7 +55,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
@@ -497,6 +503,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
@@ -497,6 +503,7 @@
install-libraries:
@for i in $(INCLUDE_INSTALL_DIR) \
@ -54,7 +63,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/11/29 09:48:55 kevlo Exp $
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -510,11 +517,19 @@ install-libraries:
@@ -510,11 +517,19 @@
chmod +x $(UNIX_DIR)/install-sh; \
fi
@echo "Installing header files";

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2002/11/29 09:48:55 kevlo Exp $
--- configure.orig Wed Oct 23 17:45:50 2002
+++ configure Fri Nov 29 17:38:11 2002
@@ -2438,9 +2438,14 @@ fi
$OpenBSD: patch-configure,v 1.9 2002/12/02 08:01:17 kevlo Exp $
--- configure.orig Mon Dec 2 15:41:32 2002
+++ configure Mon Dec 2 15:49:13 2002
@@ -2438,9 +2438,14 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2002/11/29 09:48:55 kevlo Exp $
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
@@ -2462,11 +2467,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
@@ -2462,11 +2467,11 @@
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@ -33,22 +33,22 @@ $OpenBSD: patch-configure,v 1.8 2002/11/29 09:48:55 kevlo Exp $
fi
rm -f conftest*
@@ -3075,6 +3080,8 @@ EOF
@@ -3074,6 +3079,7 @@
fi
fi
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
TK_DBGX=${DBGX}
@@ -4778,13 +4785,12 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
@@ -4778,13 +4784,12 @@
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) \${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}"
- RANLIB=":"
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
- TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ TCL_STUB_FLAGS=""
else
TK_SHLIB_CFLAGS=""
TK_LIB_FILE=libtk${TK_UNSHARED_LIB_SUFFIX}
@ -57,3 +57,12 @@ $OpenBSD: patch-configure,v 1.8 2002/11/29 09:48:55 kevlo Exp $
TCL_STUB_FLAGS=""
fi
@@ -4833,7 +4838,7 @@
eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
# FIXME: Should we add MAKE_STUB_LIB to tclConfig.sh ?
-MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
+MAKE_STUB_LIB="\${STLIB_LD} \${TK_STUB_LIB_FILE} \${STUB_LIB_OBJS}; \${RANLIB} \${TK_STUB_LIB_FILE}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"