]> git.pld-linux.org Git - packages/tcl.git/commitdiff
- from fedora
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 11 May 2009 18:00:00 +0000 (18:00 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    tcl-autopath.patch -> 1.1
    tcl-conf.patch -> 1.1
    tcl-hidden.patch -> 1.1

tcl-autopath.patch [new file with mode: 0644]
tcl-conf.patch [new file with mode: 0644]
tcl-hidden.patch [new file with mode: 0644]

diff --git a/tcl-autopath.patch b/tcl-autopath.patch
new file mode 100644 (file)
index 0000000..bd95306
--- /dev/null
@@ -0,0 +1,53 @@
+diff -up tcl8.5.1/unix/configure.in.autopath tcl8.5.1/unix/configure.in
+--- tcl8.5.1/unix/configure.in.autopath        2008-02-05 18:00:35.000000000 +0100
++++ tcl8.5.1/unix/configure.in 2008-03-17 14:57:24.000000000 +0100
+@@ -795,9 +795,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+       TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${libdir}/tk8.5 ${prefix}/lib/tcl8.5 ${prefix}/lib/tk8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${TCL_PACKAGE_PATH}"
+ fi
+ #--------------------------------------------------------------------
+diff -up tcl8.5.1/library/init.tcl.autopath tcl8.5.1/library/init.tcl
+--- tcl8.5.1/library/init.tcl.autopath 2008-02-04 18:29:11.000000000 +0100
++++ tcl8.5.1/library/init.tcl  2008-02-19 09:11:51.000000000 +0100
+@@ -48,16 +48,11 @@ if {![info exists auto_path]} {
+ }
+ namespace eval tcl {
+     variable Dir
+-    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
++    foreach Dir [list $::tcl_library] {
+       if {$Dir ni $::auto_path} {
+           lappend ::auto_path $Dir
+       }
+     }
+-    set Dir [file join [file dirname [file dirname \
+-          [info nameofexecutable]]] lib]
+-    if {$Dir ni $::auto_path} {
+-      lappend ::auto_path $Dir
+-    }
+     catch {
+       foreach Dir $::tcl_pkgPath {
+           if {$Dir ni $::auto_path} {
+diff -up tcl8.5.1/library/auto.tcl.autopath tcl8.5.1/library/auto.tcl
+--- tcl8.5.1/library/auto.tcl.autopath 2006-11-03 01:34:52.000000000 +0100
++++ tcl8.5.1/library/auto.tcl  2008-02-19 09:11:51.000000000 +0100
+@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
+           lappend dirs $value
+       }
++        # 2a. As a sibling of Tcl's script directory
++        if {[catch {
++            ::tcl::pkgconfig get scriptdir,runtime
++        } value] == 0} {
++            lappend dirs [file join [file dirname $value] $basename$version]
++        }
++
+       # 3. Relative to auto_path directories.  This checks relative to the
+       # Tcl library as well as allowing loading of libraries added to the
+       # auto_path that is not relative to the core library or binary paths.
diff --git a/tcl-conf.patch b/tcl-conf.patch
new file mode 100644 (file)
index 0000000..24d9045
--- /dev/null
@@ -0,0 +1,26 @@
+--- tcl8.5.0/unix/tcl.m4.conf  2007-12-20 10:48:05.000000000 +0100
++++ tcl8.5.0/unix/tcl.m4       2007-12-20 10:48:52.000000000 +0100
+@@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+           # get rid of the warnings.
+           #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+-          SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++          SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+           DL_OBJS="tclLoadDl.o"
+           DL_LIBS="-ldl"
+           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+           AS_IF([test $doRpath = yes], [
+-              CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++              CC_SEARCH_FLAGS=''])
+           LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+           AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+           AS_IF([test $do64bit = yes], [
+@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+           SHLIB_LD_LIBS='${LIBS}'
+           SHLIB_SUFFIX=".so"
+-          SHLIB_LD='${CC} -shared'
++          SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
+           DL_OBJS=""
+           DL_LIBS="-ldl"
+           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/tcl-hidden.patch b/tcl-hidden.patch
new file mode 100644 (file)
index 0000000..9a6d0be
--- /dev/null
@@ -0,0 +1,33 @@
+diff -up tcl8.5.6/generic/tclPort.h.old tcl8.5.6/generic/tclPort.h
+--- tcl8.5.6/generic/tclPort.h.old     2009-02-09 16:40:08.000000000 +0100
++++ tcl8.5.6/generic/tclPort.h 2009-02-09 16:40:26.000000000 +0100
+@@ -24,7 +24,7 @@
+ #if defined(__WIN32__)
+ #   include "tclWinPort.h"
+ #else
+-#   include "tclUnixPort.h"
++#   include "../unix/tclUnixPort.h"
+ #endif
+ #if !defined(LLONG_MIN)
+diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h
+--- tcl8.5.6/generic/tclInt.h.bbb      2008-11-14 01:22:39.000000000 +0100
++++ tcl8.5.6/generic/tclInt.h  2009-02-11 13:05:13.000000000 +0100
+@@ -2773,7 +2773,7 @@ MODULE_SCOPE void        TclClockInit(Tcl_Inter
+ MODULE_SCOPE int      TclClockOldscanObjCmd(
+                           ClientData clientData, Tcl_Interp *interp,
+                           int objc, Tcl_Obj *const objv[]);
+-MODULE_SCOPE int      Tcl_CloseObjCmd(ClientData clientData,
++extern int    Tcl_CloseObjCmd(ClientData clientData,
+                           Tcl_Interp *interp, int objc,
+                           Tcl_Obj *const objv[]);
+ MODULE_SCOPE int      Tcl_ConcatObjCmd(ClientData clientData,
+@@ -2934,7 +2934,7 @@ MODULE_SCOPE int Tcl_RegsubObjCmd(Client
+ MODULE_SCOPE int      Tcl_RenameObjCmd(ClientData clientData,
+                           Tcl_Interp *interp, int objc,
+                           Tcl_Obj *const objv[]);
+-MODULE_SCOPE int      Tcl_ReturnObjCmd(ClientData clientData,
++extern int    Tcl_ReturnObjCmd(ClientData clientData,
+                           Tcl_Interp *interp, int objc,
+                           Tcl_Obj *const objv[]);
+ MODULE_SCOPE int      Tcl_ScanObjCmd(ClientData clientData,
This page took 0.036055 seconds and 4 git commands to generate.