diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-06-13 10:43:43 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:30:07 +0200 |
commit | a695d15ea384001a7e68c20972e9b21785d57275 (patch) | |
tree | 2d51553b9d820678032f3d06ba691515db564368 /meta-oe/recipes-devtools/tcltk | |
parent | eccb3d022a063d74727690c8e4f384b8406b13a6 (diff) | |
download | meta-openembedded-a695d15ea384001a7e68c20972e9b21785d57275.tar.gz |
tk: Upgrade to 8.6.0
This also fixes the build since tcl is moved to 8.6.0 in OE-Core
The licence has been updated a little
license.terms 2009-11-13 10:38:48.000000000 -0800
license.terms 2012-12-19 07:39:12.000000000 -0800
@@ -1,7 +1,8 @@
This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties. The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
+California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+Corporation, Apple Inc. and other parties. The following terms apply
to
+all files associated with the software unless explicitly disclaimed in
+individual files.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose,
provided
@@ -28,12 +29,12 @@
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk')
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.5.8/manpages.diff | 23 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.5.8/rpath.diff | 40 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff (renamed from meta-oe/recipes-devtools/tcltk/tk-8.5.8/confsearch.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff (renamed from meta-oe/recipes-devtools/tcltk/tk-8.5.8/fix-xft.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff (renamed from meta-oe/recipes-devtools/tcltk/tk-8.5.8/non-linux.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff (renamed from meta-oe/recipes-devtools/tcltk/tk-8.5.8/tklibrary.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff (renamed from meta-oe/recipes-devtools/tcltk/tk-8.5.8/tkprivate.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb (renamed from meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb) | 21 |
8 files changed, 9 insertions, 75 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/manpages.diff b/meta-oe/recipes-devtools/tcltk/tk-8.5.8/manpages.diff deleted file mode 100644 index a0620bd2c..000000000 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/manpages.diff +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Patch by Chris Waters fixes installing of several manual pages which | ||
2 | aren't installed by upstream script but are referenced inside other | ||
3 | manual pages. | ||
4 | |||
5 | --- tk8.5-8.5.8.orig/unix/installManPage | ||
6 | +++ tk8.5-8.5.8/unix/installManPage | ||
7 | @@ -51,7 +51,16 @@ | ||
8 | }' $MANPAGE` | ||
9 | |||
10 | SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'` | ||
11 | +NAME=`basename $MANPAGE .$SECTION` | ||
12 | SRCDIR=`dirname $MANPAGE` | ||
13 | + | ||
14 | +SPECIALS="FindPhoto" | ||
15 | +for n in $SPECIALS; do | ||
16 | + if [ "$NAME" = "$n" ] ; then | ||
17 | + NAMES="$n $NAMES" | ||
18 | + fi | ||
19 | +done | ||
20 | + | ||
21 | FIRST="" | ||
22 | for f in $NAMES; do | ||
23 | f=$f.$SECTION$SUFFIX | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/rpath.diff b/meta-oe/recipes-devtools/tcltk/tk-8.5.8/rpath.diff deleted file mode 100644 index 81169aab2..000000000 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/rpath.diff +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Patch by Chris Waters removes -rpath from search flags and adds -soname | ||
2 | to library build options. | ||
3 | |||
4 | Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl | ||
5 | |||
6 | --- tk8.5-8.5.8.orig/unix/configure | ||
7 | +++ tk8.5-8.5.8/unix/configure | ||
8 | @@ -5557,6 +5557,9 @@ | ||
9 | # get rid of the warnings. | ||
10 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | ||
11 | |||
12 | + # following line added by CW for Debian GNU/Linux | ||
13 | + TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0" | ||
14 | + | ||
15 | SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' | ||
16 | DL_OBJS="tclLoadDl.o" | ||
17 | DL_LIBS="-ldl" | ||
18 | --- tk8.5-8.5.8.orig/unix/Makefile.in | ||
19 | +++ tk8.5-8.5.8/unix/Makefile.in | ||
20 | @@ -713,7 +713,7 @@ | ||
21 | echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ | ||
22 | relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ | ||
23 | echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ | ||
24 | - [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ | ||
25 | + [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\ | ||
26 | ) > "$(PKG_INDEX)"; \ | ||
27 | fi | ||
28 | @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" | ||
29 | --- tk8.5-8.5.8.orig/unix/tcl.m4 | ||
30 | +++ tk8.5-8.5.8/unix/tcl.m4 | ||
31 | @@ -1433,6 +1433,9 @@ | ||
32 | # get rid of the warnings. | ||
33 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | ||
34 | |||
35 | + # following line added by CW for Debian GNU/Linux | ||
36 | + TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0" | ||
37 | + | ||
38 | SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' | ||
39 | DL_OBJS="tclLoadDl.o" | ||
40 | DL_LIBS="-ldl" | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff index c51e47542..c51e47542 100644 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff | |||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff index d1bb7105c..d1bb7105c 100644 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/fix-xft.diff +++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff | |||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/non-linux.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff index 9309fc48e..9309fc48e 100644 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/non-linux.diff +++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff | |||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/tklibrary.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff index ee38c2a1a..ee38c2a1a 100644 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/tklibrary.diff +++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff | |||
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff index 4e1546973..4e1546973 100644 --- a/meta-oe/recipes-devtools/tcltk/tk-8.5.8/tkprivate.diff +++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff | |||
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb index d44b407ef..b76f58f9e 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | |||
@@ -2,42 +2,39 @@ DESCRIPTION = "Tool Command Language ToolKit Extension" | |||
2 | HOMEPAGE = "http://tcl.sourceforge.net" | 2 | HOMEPAGE = "http://tcl.sourceforge.net" |
3 | SECTION = "devel/tcltk" | 3 | SECTION = "devel/tcltk" |
4 | LICENSE = "tcl" | 4 | LICENSE = "tcl" |
5 | LIC_FILES_CHKSUM = "file://license.terms;md5=24954e7e6b54c1b4e16de861b9d392fc" | 5 | LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe" |
6 | DEPENDS = "tcl virtual/libx11 libxt" | 6 | DEPENDS = "tcl virtual/libx11 libxt" |
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_URI = "\ |
9 | ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ | 9 | ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ |
10 | file://confsearch.diff;striplevel=2 \ | 10 | file://confsearch.diff;striplevel=2 \ |
11 | file://manpages.diff;striplevel=2 \ | ||
12 | file://non-linux.diff;striplevel=2 \ | 11 | file://non-linux.diff;striplevel=2 \ |
13 | file://rpath.diff;striplevel=2 \ | ||
14 | file://tklibrary.diff;striplevel=2 \ | 12 | file://tklibrary.diff;striplevel=2 \ |
15 | file://tkprivate.diff;striplevel=2 \ | 13 | file://tkprivate.diff;striplevel=2 \ |
16 | file://fix-xft.diff \ | 14 | file://fix-xft.diff \ |
17 | " | 15 | " |
18 | SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6" | 16 | SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8" |
19 | SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4" | 17 | SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6" |
20 | 18 | ||
21 | S = "${WORKDIR}/tk${PV}/unix" | 19 | S = "${WORKDIR}/tk${PV}/unix" |
22 | 20 | LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/8.6.0/lib" | |
23 | inherit autotools | 21 | inherit autotools |
24 | 22 | ||
25 | EXTRA_OECONF = "\ | 23 | EXTRA_OECONF = "\ |
26 | --enable-threads \ | 24 | --enable-threads \ |
25 | --with-x \ | ||
27 | --with-tcl=${STAGING_BINDIR_CROSS} \ | 26 | --with-tcl=${STAGING_BINDIR_CROSS} \ |
28 | --x-includes=${STAGING_INCDIR} \ | ||
29 | --x-libraries=${STAGING_LIBDIR} \ | ||
30 | " | 27 | " |
31 | 28 | ||
32 | do_install_append() { | 29 | do_install_append() { |
33 | mv libtk8.5.so libtk8.5.so.0 | 30 | mv libtk8.6.so libtk8.6.so.0 |
34 | oe_libinstall -so libtk8.5 ${D}${libdir} | 31 | oe_libinstall -so libtk8.6 ${D}${libdir} |
35 | ln -sf wish8.5 ${D}${bindir}/wish | 32 | ln -sf wish8.6 ${D}${bindir}/wish |
36 | } | 33 | } |
37 | 34 | ||
38 | PACKAGES =+ "${PN}-lib" | 35 | PACKAGES =+ "${PN}-lib" |
39 | 36 | ||
40 | FILES_${PN}-lib = "${libdir}/libtk8.5.so.*" | 37 | FILES_${PN}-lib = "${libdir}/libtk8.6.so.*" |
41 | FILES_${PN} += "${libdir}/tk*" | 38 | FILES_${PN} += "${libdir}/tk*" |
42 | 39 | ||
43 | BINCONFIG_GLOB = "*Config.sh" | 40 | BINCONFIG_GLOB = "*Config.sh" |