diff options
author | Stanislav Brabec <utx@penguin.cz> | 2011-04-20 19:51:59 +0000 |
---|---|---|
committer | utx@penguin.cz <utx@penguin.cz> | 2011-04-20 20:02:19 +0000 |
commit | 28439c85d7c41e55e7967ecc07030d90073da9e1 (patch) | |
tree | 781d81026d2d77041ff174919bb7669af5738423 /recipes/tcltk | |
parent | 06b3943adda20724b97c807299b35fd4d232a5c5 (diff) | |
download | openembedded-28439c85d7c41e55e7967ecc07030d90073da9e1.tar.gz |
tcl: Remove old version 8.4.19.
Signed-off-by: Stanislav Brabec <utx@penguin.cz>
Diffstat (limited to 'recipes/tcltk')
-rw-r--r-- | recipes/tcltk/files/tcl-add-soname.patch | 72 | ||||
-rw-r--r-- | recipes/tcltk/tcl-native_8.4.19.bb | 25 | ||||
-rw-r--r-- | recipes/tcltk/tcl/fix-configure.patch | 44 | ||||
-rw-r--r-- | recipes/tcltk/tcl_8.4.19.bb | 58 |
4 files changed, 0 insertions, 199 deletions
diff --git a/recipes/tcltk/files/tcl-add-soname.patch b/recipes/tcltk/files/tcl-add-soname.patch deleted file mode 100644 index 38762644cd..0000000000 --- a/recipes/tcltk/files/tcl-add-soname.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- clean/tcl8.4.19/unix/configure 2008-04-17 21:29:49.000000000 +0100 -+++ tcl8.4.19/unix/configure 2009-11-13 11:46:36.000000000 +0000 -@@ -3065,6 +3065,7 @@ - SHLIB_CFLAGS="-fPIC" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" -+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' - - CFLAGS_OPTIMIZE=-O2 - # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings -@@ -3072,12 +3073,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}" -+ - 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_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` -@@ -4299,7 +4303,7 @@ - - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} ---- clean/tcl8.4.19/unix/tcl.m4 2008-04-17 21:29:49.000000000 +0100 -+++ tcl8.4.19/unix/tcl.m4 2009-11-13 11:53:57.000000000 +0000 -@@ -1337,6 +1337,7 @@ - SHLIB_CFLAGS="-fPIC" - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0' - - CFLAGS_OPTIMIZE=-O2 - # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings -@@ -1344,12 +1345,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, [ -@@ -2117,7 +2121,7 @@ - - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} diff --git a/recipes/tcltk/tcl-native_8.4.19.bb b/recipes/tcltk/tcl-native_8.4.19.bb deleted file mode 100644 index ce19c331b2..0000000000 --- a/recipes/tcltk/tcl-native_8.4.19.bb +++ /dev/null @@ -1,25 +0,0 @@ -inherit native -include tcl_8.4.19.bb - -do_stage() { - oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR} - oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} - sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh - sed -i "s,-L${libdir},," tclConfig.sh - install -d ${STAGING_BINDIR}/ - install -m 0755 tclConfig.sh ${STAGING_BINDIR} - install -m 0755 tclsh ${STAGING_BINDIR}/tclsh8.4 - ln -s -f tclsh8.4 ${STAGING_BINDIR}/tclsh - cd .. - for dir in compat generic unix - do - install -d ${STAGING_INCDIR}/tcl${PV}/$dir - install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/ - done - install -m 0644 generic/tcl.h ${STAGING_INCDIR} - install -m 0644 generic/tclDecls.h ${STAGING_INCDIR} - install -m 0644 generic/tclPlatDecls.h ${STAGING_INCDIR} -} - -SRC_URI[md5sum] = "ade2c033a7b545ee108f3fdfeb629fcf" -SRC_URI[sha256sum] = "1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9" diff --git a/recipes/tcltk/tcl/fix-configure.patch b/recipes/tcltk/tcl/fix-configure.patch deleted file mode 100644 index 8b2654bae0..0000000000 --- a/recipes/tcltk/tcl/fix-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: unix/tcl.m4 -=================================================================== ---- tcl8.4.11/unix.orig/tcl.m4 -+++ tcl8.4.11/unix/tcl.m4 -@@ -845,7 +845,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2250,7 +2250,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -Index: unix/configure -=================================================================== ---- tcl8.4.11/unix.orig/configure -+++ tcl8.4.11/unix/configure -@@ -2130,7 +2130,7 @@ echo "configure:2121: checking system ve - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print }' /etc/.relid'` -+ system=MP-RAS-`awk '{print }' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -7608,7 +7608,7 @@ echo "configure:7600: checking FIONBIO v - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print }' /etc/.relid'` -+ system=MP-RAS-`awk '{print }' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` diff --git a/recipes/tcltk/tcl_8.4.19.bb b/recipes/tcltk/tcl_8.4.19.bb deleted file mode 100644 index a4a92a121f..0000000000 --- a/recipes/tcltk/tcl_8.4.19.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "Tool Command Language" -LICENSE = "tcl" -SECTION = "devel/tcltk" -HOMEPAGE = "http://tcl.sourceforge.net" -PR = "r4" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ - file://tcl-add-soname.patch;striplevel=2 \ -# file://fix-configure.patch;striplevel=2 \ -" -S = "${WORKDIR}/tcl${PV}/unix" - -inherit autotools - -EXTRA_OECONF = "--enable-threads" - -FILES_${PN} += "${prefix}/lib" - -do_configure() { - gnu-configize - oe_runconf -} - -do_compile_prepend() { - echo > ../compat/fixstrtod.c -} - -do_stage() { - oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR} - oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} - sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh - sed -i "s,-L${libdir},," tclConfig.sh - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS} - cd .. - for dir in compat generic unix - do - install -d ${STAGING_INCDIR}/tcl${PV}/$dir - install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/ - done - install -m 0644 generic/tcl.h ${STAGING_INCDIR} - install -m 0644 generic/tclDecls.h ${STAGING_INCDIR} - install -m 0644 generic/tclPlatDecls.h ${STAGING_INCDIR} -} - -do_install() { - autotools_do_install - ln -sf ./tclsh8.4 ${D}${bindir}/tclsh -} - -PACKAGES =+ "${PN}-lib" -FILES_${PN}-lib = "${libdir}/libtcl8.4.so.*" -FILES_${PN} += "${libdir}/tcl8.4" -FILES_${PN}-dev += "${libdir}/tclConfig.sh" - -SRC_URI[md5sum] = "ade2c033a7b545ee108f3fdfeb629fcf" -SRC_URI[sha256sum] = "1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9" |