diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-24 21:06:22 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-24 21:23:09 +0100 |
| commit | 2d441c0f1b596a90dc4b8ecac238b435132de4c1 (patch) | |
| tree | 7f6acf49447578e9ba5a50758977846b8661b4d1 /packages/tcltk/files/tcl-add-soname.patch | |
| parent | cc6c7c1e02f587b97b779bf68a89cb695e06f4a7 (diff) | |
tcltk: 8.4.11 -> 8.4.19; try harder to get proper library packaging
Diffstat (limited to 'packages/tcltk/files/tcl-add-soname.patch')
| -rw-r--r-- | packages/tcltk/files/tcl-add-soname.patch | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/packages/tcltk/files/tcl-add-soname.patch b/packages/tcltk/files/tcl-add-soname.patch index fe02736005..951244327b 100644 --- a/packages/tcltk/files/tcl-add-soname.patch +++ b/packages/tcltk/files/tcl-add-soname.patch @@ -1,12 +1,41 @@ -diff -u tcl8.3.5/unix/tcl.m4~ tcl8.3.5/unix/tcl.m4 ---- unix/tcl.m4~ 2003-01-14 20:42:53.000000000 +0900 -+++ unix/tcl.m4 2003-01-14 20:42:53.000000000 +0900 -@@ -954,7 +954,7 @@ - CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" +Patch by Chris Waters removes -rpath from search flags and adds -soname +to library build options. + +--- tcl8.4-8.4.19.orig/unix/configure ++++ tcl8.4-8.4.19/unix/configure +@@ -3072,12 +3072,15 @@ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" ++ # following line added by CW for Debian GNU/Linux ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" ++ if test "$have_dl" = yes; then -- SHLIB_LD="${CC} -shared" -+ SHLIB_LD='${CC} -shared -Wl,-soname,${@}' + SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-rdynamic" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else + ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` +--- tcl8.4-8.4.19.orig/unix/tcl.m4 ++++ tcl8.4-8.4.19/unix/tcl.m4 +@@ -1346,12 +1346,15 @@ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + ++ # following line added by CW for Debian GNU/Linux ++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" ++ + if test "$have_dl" = yes; then + SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else + AC_CHECK_HEADER(dld.h, [ |