[oe-commits] Stanislav Brabec : tk: Remove old version 8.4.19.

Thu Apr 21 20:02:39 UTC 2011

Module: openembedded.git
Branch: testing-next
Commit: 38058be0f8d5f6badd9116ed00f1b99f71347cc8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=38058be0f8d5f6badd9116ed00f1b99f71347cc8

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Wed Apr 20 19:53:45 2011 +0000

tk: Remove old version 8.4.19.

Signed-off-by: Stanislav Brabec <utx at penguin.cz>

---

 recipes/tcltk/files/disable-xim.patch   |   20 ----------
 recipes/tcltk/files/tk-add-soname.patch |   64 -------------------------------
 recipes/tcltk/tk-native_8.4.19.bb       |   25 ------------
 recipes/tcltk/tk/fix-configure.patch    |   16 --------
 recipes/tcltk/tk_8.4.19.bb              |   59 ----------------------------
 5 files changed, 0 insertions(+), 184 deletions(-)

diff --git a/recipes/tcltk/files/disable-xim.patch b/recipes/tcltk/files/disable-xim.patch
deleted file mode 100644
index d88aa7c..0000000
--- a/recipes/tcltk/files/disable-xim.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- generic/tk.h~disable-xim
-+++ generic/tk.h
-@@ -109,9 +109,9 @@
-  * Decide whether or not to use input methods.
-  */
- 
--#ifdef XNQueryInputStyle
--#define TK_USE_INPUT_METHODS
--#endif
-+//#ifdef XNQueryInputStyle
-+#undef TK_USE_INPUT_METHODS
-+//#endif
- 
- /*
-  * Dummy types that are used by clients:
diff --git a/recipes/tcltk/files/tk-add-soname.patch b/recipes/tcltk/files/tk-add-soname.patch
deleted file mode 100644
index f1f132f..0000000
--- a/recipes/tcltk/files/tk-add-soname.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Patch by Chris Waters removes -rpath from search flags and adds -soname
-to library build options.
-
-Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
-
---- tk8.4-8.4.19.orig/unix/configure
-+++ tk8.4-8.4.19/unix/configure
-@@ -2568,12 +2568,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
-+	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_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_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
---- tk8.4-8.4.19.orig/unix/Makefile.in
-+++ tk8.4-8.4.19/unix/Makefile.in
-@@ -635,7 +635,7 @@
- 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- 	    echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
- 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
--		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+		[list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
- 	    ) > $(PKG_INDEX); \
- 	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.4-8.4.19.orig/unix/tcl.m4
-+++ tk8.4-8.4.19/unix/tcl.m4
-@@ -1346,20 +1346,23 @@
- 	    # 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
-+	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_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}'
--		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-+		CC_SEARCH_FLAGS=""
-+		LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
- 	    else
- 		AC_CHECK_HEADER(dld.h, [
- 		    SHLIB_LD="ld -shared"
- 		    DL_OBJS="tclLoadDld.o"
- 		    DL_LIBS="-ldld"
- 		    CC_SEARCH_FLAGS=""
--		    LD_SEARCH_FLAGS=""])
-+		    LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"])
- 	    fi
- 	    if test "`uname -m`" = "alpha" ; then
- 		CFLAGS="$CFLAGS -mieee"
diff --git a/recipes/tcltk/tk-native_8.4.19.bb b/recipes/tcltk/tk-native_8.4.19.bb
deleted file mode 100644
index bfb3464..0000000
--- a/recipes/tcltk/tk-native_8.4.19.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-inherit native
-include tk_8.4.19.bb
-DEPENDS = "tcl-native"
-
-do_stage() {
-        oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
-        oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
-        sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh
-        install -m 0755 tkConfig.sh ${STAGING_BINDIR}
-	install -m 0755 wish ${STAGING_BINDIR}/wish8.4
-	ln -s wish8.4 ${STAGING_BINDIR}/wish
-	cd ..
-	#for dir in compat generic unix
-	#do
-	#	install -d ${STAGING_INCDIR}/tk${PV}/$dir
-	#install -m 0644 $dir/*.h ${STAGING_INCDIR}/tk${PV}/$dir/
-	#done
-	install -m 0644 generic/tk.h ${STAGING_INCDIR}
-	install -m 0644 generic/tkDecls.h ${STAGING_INCDIR}
-	install -m 0644 generic/tkPlatDecls.h ${STAGING_INCDIR}
-
-}
-
-SRC_URI[md5sum] = "9b998d0456d1b956eb9da610837a9c47"
-SRC_URI[sha256sum] = "d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f"
diff --git a/recipes/tcltk/tk/fix-configure.patch b/recipes/tcltk/tk/fix-configure.patch
deleted file mode 100644
index 6c6f037..0000000
--- a/recipes/tcltk/tk/fix-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- tk8.4.11/unix/configure~fix-configure
-+++ tk8.4.11/unix/configure
-@@ -1849,7 +1849,7 @@
- 	    # 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/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
deleted file mode 100644
index 3dd4920..0000000
--- a/recipes/tcltk/tk_8.4.19.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "Tool Command Language ToolKit Extension"
-LICENSE = "tcl"
-SECTION = "devel/tcltk"
-HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl virtual/libx11 libxt"
-PR = "r1"
-
-SRC_URI = "\
-  ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
-  file://disable-xim.patch;patchdir=..;striplevel=0 \
-  file://tk-add-soname.patch;striplevel=2 \
-#  file://fix-configure.patch;striplevel=2 \
-"
-S = "${WORKDIR}/tk${PV}/unix"
-
-inherit autotools
-
-EXTRA_OECONF = "\
-  --enable-threads \
-  --with-tcl=${STAGING_BINDIR_CROSS} \
-  --x-includes=${STAGING_INCDIR} \
-  --x-libraries=${STAGING_LIBDIR} \
-"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
-do_stage() {
-	oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
-	oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
-	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh
-	install -m 0755 tkConfig.sh ${STAGING_BINDIR_CROSS}
-	cd ..
-	#for dir in compat generic unix
-	#do
-	#	install -d ${STAGING_INCDIR}/tk${PV}/$dir
-	#install -m 0644 $dir/*.h ${STAGING_INCDIR}/tk${PV}/$dir/
-	#done
-	install -m 0644 generic/tk.h ${STAGING_INCDIR}
-	install -m 0644 generic/tkDecls.h ${STAGING_INCDIR}
-	install -m 0644 generic/tkPlatDecls.h ${STAGING_INCDIR}
-
-}
-
-do_install() {
-	autotools_do_install
-	mv libtk8.4.so libtk8.4.so.0
-	oe_libinstall -so libtk8.4 ${D}${libdir}
-	ln -sf ./wish8.4 ${D}${bindir}/wish
-}
-
-PACKAGES =+ "${PN}-lib"
-FILES_${PN}-lib = "${libdir}/libtk8.4.so.*"
-FILES_${PN} += "${libdir}"
-
-SRC_URI[md5sum] = "9b998d0456d1b956eb9da610837a9c47"
-SRC_URI[sha256sum] = "d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f"



