summaryrefslogtreecommitdiff
path: root/packages/tcltk
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/tcltk
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/tcltk')
-rw-r--r--packages/tcltk/files/disable-xim.patch20
-rw-r--r--packages/tcltk/files/tcl-add-soname.patch41
-rw-r--r--packages/tcltk/files/tk-add-soname.patch64
-rw-r--r--packages/tcltk/tcl-native_8.4.19.bb22
-rw-r--r--packages/tcltk/tcl/fix-configure.patch44
-rw-r--r--packages/tcltk/tcl_8.4.19.bb55
-rw-r--r--packages/tcltk/tk-native_8.4.19.bb22
-rw-r--r--packages/tcltk/tk/fix-configure.patch16
-rw-r--r--packages/tcltk/tk_8.4.19.bb56
9 files changed, 0 insertions, 340 deletions
diff --git a/packages/tcltk/files/disable-xim.patch b/packages/tcltk/files/disable-xim.patch
deleted file mode 100644
index bc11d3bbe9..0000000000
--- a/packages/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/packages/tcltk/files/tcl-add-soname.patch b/packages/tcltk/files/tcl-add-soname.patch
deleted file mode 100644
index 951244327b..0000000000
--- a/packages/tcltk/files/tcl-add-soname.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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 ${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_%'`
---- 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, [
diff --git a/packages/tcltk/files/tk-add-soname.patch b/packages/tcltk/files/tk-add-soname.patch
deleted file mode 100644
index f1f132f2a4..0000000000
--- a/packages/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/packages/tcltk/tcl-native_8.4.19.bb b/packages/tcltk/tcl-native_8.4.19.bb
deleted file mode 100644
index a2d5efae42..0000000000
--- a/packages/tcltk/tcl-native_8.4.19.bb
+++ /dev/null
@@ -1,22 +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 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}
-}
diff --git a/packages/tcltk/tcl/fix-configure.patch b/packages/tcltk/tcl/fix-configure.patch
deleted file mode 100644
index 8b2654bae0..0000000000
--- a/packages/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/packages/tcltk/tcl_8.4.19.bb b/packages/tcltk/tcl_8.4.19.bb
deleted file mode 100644
index e70a2c861c..0000000000
--- a/packages/tcltk/tcl_8.4.19.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "Tool Command Language"
-LICENSE = "tcl"
-SECTION = "devel/tcltk"
-HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r2"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
- file://tcl-add-soname.patch;patch=1;pnum=2 \
-# file://fix-configure.patch;patch=1;pnum=2 \
-"
-S = "${WORKDIR}/tcl${PV}/unix"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-threads"
-
-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
- mv libtcl8.4.so libtcl8.4.so.0
- oe_libinstall -so libtcl8.4 ${D}${libdir}
- 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"
diff --git a/packages/tcltk/tk-native_8.4.19.bb b/packages/tcltk/tk-native_8.4.19.bb
deleted file mode 100644
index df880769ff..0000000000
--- a/packages/tcltk/tk-native_8.4.19.bb
+++ /dev/null
@@ -1,22 +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}
-
-}
diff --git a/packages/tcltk/tk/fix-configure.patch b/packages/tcltk/tk/fix-configure.patch
deleted file mode 100644
index 6c6f0374bd..0000000000
--- a/packages/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/packages/tcltk/tk_8.4.19.bb b/packages/tcltk/tk_8.4.19.bb
deleted file mode 100644
index a9bb0bd6df..0000000000
--- a/packages/tcltk/tk_8.4.19.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "Tool Command Language ToolKit Extension"
-LICENSE = "tcl"
-SECTION = "devel/tcltk"
-HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl virtual/libx11 libxt"
-PR = "r0"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
- file://disable-xim.patch;patch=1;pnum=0 \
- file://tk-add-soname.patch;patch=1;pnum=2 \
-# file://fix-configure.patch;patch=1;pnum=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}"