diff options
author | Scott Mace <smace@FreeBSD.org> | 1998-10-11 19:51:43 +0000 |
---|---|---|
committer | Scott Mace <smace@FreeBSD.org> | 1998-10-11 19:51:43 +0000 |
commit | f0a728314809be9bafd959c2ad38e584b4b722ba (patch) | |
tree | 5715344b70ca836d67b05e097a7f40f107fc222d /lang/tclX | |
parent | Convert to ELF. (diff) |
Convert to ELF.
PR: 8017
Approved by: jseger
Notes
Notes:
svn path=/head/; revision=13873
Diffstat (limited to 'lang/tclX')
-rw-r--r-- | lang/tclX/files/patch-ab | 27 | ||||
-rw-r--r-- | lang/tclX/files/patch-ac | 25 |
2 files changed, 47 insertions, 5 deletions
diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab index 64587cd18d07..994ef31c97e5 100644 --- a/lang/tclX/files/patch-ab +++ b/lang/tclX/files/patch-ab @@ -1,5 +1,5 @@ ---- ../tcl/unix/Makefile.in.ORIG Sun May 3 18:52:36 1998 -+++ ../tcl/unix/Makefile.in Sun May 3 18:53:16 1998 +--- ../tcl/unix/Makefile.in.orig Sat Nov 29 17:19:02 1997 ++++ ../tcl/unix/Makefile.in Mon Sep 28 14:13:29 1998 @@ -124,7 +124,7 @@ # If a link fails, purge the executable, as some systems leave invalid # executables around. @@ -9,7 +9,15 @@ static: tcl.static tclXtest.static -@@ -173,7 +173,7 @@ +@@ -152,6 +152,7 @@ + TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \ + LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ + ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS} ++ ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'` + + hello: hello.c + ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} +@@ -173,7 +174,7 @@ # unless we don't have them. # RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl autoload.tcl help.tmp \ @@ -18,3 +26,16 @@ tcl.tlib: ${TLIB_SRCS} autoload.tcl -rm -f tcl.tlib tcl.tndx +@@ -316,9 +317,11 @@ + ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \ + ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \ + fi +- ${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB} ++ ${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_RUNTIME} + if test "@BUILD_SHARED@" = "YES"; then \ + ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\ ++ (cd ${INSTALL_ROOT}${TCLX_INST_LIB} && \ ++ ln -sf ${TCLX_SHLIB_NAME} `echo ${TCLX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\ + ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\ + fi + diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac index 1486eb003eff..5d94210413ca 100644 --- a/lang/tclX/files/patch-ac +++ b/lang/tclX/files/patch-ac @@ -1,5 +1,5 @@ ---- ../tk/unix/Makefile.in.ORIG Sun May 3 18:54:47 1998 -+++ ../tk/unix/Makefile.in Sun May 3 18:55:31 1998 +--- ../tk/unix/Makefile.in.orig Sat Nov 29 17:19:07 1997 ++++ ../tk/unix/Makefile.in Mon Sep 28 14:14:16 1998 @@ -85,7 +85,7 @@ # If a link fails, purge the executable, as some systems leave invalid # executables around. @@ -9,3 +9,24 @@ static: wishx.static tktest.static +@@ -112,6 +112,7 @@ + ${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \ + ${TK_BUILD_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \ + ${TCL_BUILD_LIB_SPEC} ${TCL_SHLIB_LD_LIBS} ++ ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'` + + hello: hello.c + ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} +@@ -223,9 +224,11 @@ + ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \ + ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \ + fi +- ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB} ++ ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_RUNTIME} + if test "@BUILD_SHARED@" = "YES"; then \ + ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\ ++ (cd ${INSTALL_ROOT}${TKX_INST_LIB} && \ ++ ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`) ;\ + ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\ + fi + ${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN} |