diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 08:24:37 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 08:24:37 +0000 |
| commit | 8f7ae93769b355e3725bda1869b23bc8784bff1b (patch) | |
| tree | 0e30ba373916b8361c9b40b6e3693cc60c013285 /japanese/tk42/files/patch-ac | |
| parent | Remove empty directories on deinstall. (diff) | |
ELFization patch.
PR: ports/8044
Submitted by: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
Notes
Notes:
svn path=/head/; revision=13452
Diffstat (limited to 'japanese/tk42/files/patch-ac')
| -rw-r--r-- | japanese/tk42/files/patch-ac | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/japanese/tk42/files/patch-ac b/japanese/tk42/files/patch-ac index 86328c428eba..0f17b95d3da5 100644 --- a/japanese/tk42/files/patch-ac +++ b/japanese/tk42/files/patch-ac @@ -1,33 +1,5 @@ ---- ./unix/configure.ORIG Tue Feb 11 18:36:42 1997 -+++ ./unix/configure Tue Feb 11 18:40:37 1997 -@@ -660,14 +660,14 @@ - if test -n "$withval"; then - TCL_BIN_DIR=$withval - else -- TCL_BIN_DIR=`cd ../../tcl7.6/unix; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl7.6jp - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl, or you did not use ports?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -2115,6 +2115,7 @@ - s%@SHLIB_VERSION@%$SHLIB_VERSION%g - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g - s%@TCL_VERSION@%$TCL_VERSION%g - s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g ---- ./unix/configure.in.ORIG Tue Feb 11 18:36:43 1997 -+++ ./unix/configure.in Tue Feb 11 18:40:56 1997 +--- ./unix/configure.in.ORIG Sun Sep 20 16:37:42 1998 ++++ ./unix/configure.in Sun Sep 20 16:51:27 1998 @@ -34,12 +34,12 @@ #-------------------------------------------------------------------- @@ -44,7 +16,19 @@ fi #-------------------------------------------------------------------- -@@ -330,6 +330,7 @@ +@@ -298,7 +298,11 @@ + if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then + TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" + eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}" ++ if test "X$PORTOBJFORMAT" = "Xelf"; then ++ MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} -Wl,-soname,${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" ++ else + MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" ++ fi + RANLIB=":" + else + TK_SHLIB_CFLAGS="" +@@ -330,6 +334,7 @@ AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_BUILD_LIB_SPEC) |