diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-06-22 03:06:55 -0700 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-06-30 23:30:27 -0700 |
commit | ea7fbed6430bca27953a0ac4f1820d75e09f8d46 (patch) | |
tree | b9b13248719393dd9d9dd92fea3fe1fe78ce1def /meta | |
parent | 31c0e3df13151307c34d40c5c746f55c5e068127 (diff) | |
download | poky-ea7fbed6430bca27953a0ac4f1820d75e09f8d46.tar.gz |
tcl: upgraded from 8.4.19 to 8.5.8
patche changes:
tcl-add-soname.patch: rebased to the newer release code
Also added metadata variables, LIC_FILES_CHKSUM
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/tcltk/tcl/tcl-add-soname.patch | 82 | ||||
-rw-r--r-- | meta/packages/tcltk/tcl_8.5.8.bb (renamed from meta/packages/tcltk/tcl_8.4.19.bb) | 20 |
2 files changed, 44 insertions, 58 deletions
diff --git a/meta/packages/tcltk/tcl/tcl-add-soname.patch b/meta/packages/tcltk/tcl/tcl-add-soname.patch index 38762644cd..9cb816da51 100644 --- a/meta/packages/tcltk/tcl/tcl-add-soname.patch +++ b/meta/packages/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,72 +1,50 @@ | |||
1 | --- clean/tcl8.4.19/unix/configure 2008-04-17 21:29:49.000000000 +0100 | 1 | Index: unix/configure |
2 | +++ tcl8.4.19/unix/configure 2009-11-13 11:46:36.000000000 +0000 | 2 | =================================================================== |
3 | @@ -3065,6 +3065,7 @@ | 3 | --- unix.orig/configure |
4 | SHLIB_CFLAGS="-fPIC" | 4 | +++ unix/configure |
5 | @@ -6726,6 +6726,7 @@ fi | ||
6 | # symbols when dynamically loaded into tclsh. | ||
5 | SHLIB_LD_LIBS='${LIBS}' | 7 | SHLIB_LD_LIBS='${LIBS}' |
6 | SHLIB_SUFFIX=".so" | 8 | SHLIB_SUFFIX=".so" |
7 | + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' | 9 | + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' |
8 | 10 | ||
9 | CFLAGS_OPTIMIZE=-O2 | 11 | DL_OBJS="tclLoadDl.o" |
10 | # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings | 12 | LD_LIBRARY_PATH_VAR="LIBPATH" |
11 | @@ -3072,12 +3073,15 @@ | 13 | Index: unix/tcl.m4 |
12 | # get rid of the warnings. | 14 | =================================================================== |
13 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 15 | --- unix.orig/tcl.m4 |
14 | 16 | +++ unix/tcl.m4 | |
15 | + # following line added by CW for Debian GNU/Linux | 17 | @@ -1424,6 +1424,7 @@ dnl AC_CHECK_TOOL(AR, ar) |
16 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}" | ||
17 | + | ||
18 | if test "$have_dl" = yes; then | ||
19 | SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' | ||
20 | DL_OBJS="tclLoadDl.o" | ||
21 | DL_LIBS="-ldl" | ||
22 | LDFLAGS="$LDFLAGS -Wl,--export-dynamic" | ||
23 | - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | ||
24 | + CC_SEARCH_FLAGS="" | ||
25 | LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} | ||
26 | else | ||
27 | ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` | ||
28 | @@ -4299,7 +4303,7 @@ | ||
29 | |||
30 | if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then | ||
31 | LIB_SUFFIX=${SHARED_LIB_SUFFIX} | ||
32 | - MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' | ||
33 | + 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}' | ||
34 | INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' | ||
35 | else | ||
36 | LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} | ||
37 | --- clean/tcl8.4.19/unix/tcl.m4 2008-04-17 21:29:49.000000000 +0100 | ||
38 | +++ tcl8.4.19/unix/tcl.m4 2009-11-13 11:53:57.000000000 +0000 | ||
39 | @@ -1337,6 +1337,7 @@ | ||
40 | SHLIB_CFLAGS="-fPIC" | 18 | SHLIB_CFLAGS="-fPIC" |
41 | SHLIB_LD_LIBS='${LIBS}' | 19 | SHLIB_LD_LIBS='${LIBS}' |
42 | SHLIB_SUFFIX=".so" | 20 | SHLIB_SUFFIX=".so" |
43 | + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0' | 21 | + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0' |
44 | 22 | ||
45 | CFLAGS_OPTIMIZE=-O2 | 23 | CFLAGS_OPTIMIZE="-O2" |
46 | # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings | 24 | # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings |
47 | @@ -1344,12 +1345,15 @@ | 25 | @@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar) |
48 | # get rid of the warnings. | 26 | # get rid of the warnings. |
49 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 27 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
50 | 28 | ||
51 | + # following line added by CW for Debian GNU/Linux | 29 | + # following line added by CW for Debian GNU/Linux |
52 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | 30 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" |
53 | + | 31 | + |
54 | if test "$have_dl" = yes; then | 32 | SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' |
55 | SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' | 33 | DL_OBJS="tclLoadDl.o" |
56 | DL_OBJS="tclLoadDl.o" | 34 | DL_LIBS="-ldl" |
57 | DL_LIBS="-ldl" | 35 | LDFLAGS="$LDFLAGS -Wl,--export-dynamic" |
58 | LDFLAGS="$LDFLAGS -Wl,--export-dynamic" | 36 | AS_IF([test $doRpath = yes], [ |
59 | - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' | 37 | - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) |
60 | + CC_SEARCH_FLAGS="" | 38 | + CC_SEARCH_FLAGS='']) |
61 | LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} | 39 | LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} |
62 | else | 40 | AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) |
63 | AC_CHECK_HEADER(dld.h, [ | 41 | AS_IF([test $do64bit = yes], [ |
64 | @@ -2117,7 +2121,7 @@ | 42 | @@ -2079,7 +2083,7 @@ dnl # preprocessing tests use only CPPFL |
65 | 43 | ||
66 | if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then | 44 | AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ |
67 | LIB_SUFFIX=${SHARED_LIB_SUFFIX} | 45 | LIB_SUFFIX=${SHARED_LIB_SUFFIX} |
68 | - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' | 46 | - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' |
69 | + 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}' | 47 | + MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' |
70 | INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' | 48 | INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' |
71 | else | 49 | ], [ |
72 | LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} | 50 | LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} |
diff --git a/meta/packages/tcltk/tcl_8.4.19.bb b/meta/packages/tcltk/tcl_8.5.8.bb index 33d600bc79..7734c8833e 100644 --- a/meta/packages/tcltk/tcl_8.4.19.bb +++ b/meta/packages/tcltk/tcl_8.5.8.bb | |||
@@ -2,11 +2,19 @@ DESCRIPTION = "Tool Command Language" | |||
2 | LICENSE = "tcl" | 2 | LICENSE = "tcl" |
3 | SECTION = "devel/tcltk" | 3 | SECTION = "devel/tcltk" |
4 | HOMEPAGE = "http://tcl.sourceforge.net" | 4 | HOMEPAGE = "http://tcl.sourceforge.net" |
5 | PR = "r3" | 5 | LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ |
6 | file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | ||
7 | file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | ||
8 | file://../macosx/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | ||
9 | file://../tests/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | ||
10 | file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | ||
11 | " | ||
12 | |||
13 | PR = "r0" | ||
6 | 14 | ||
7 | SRC_URI = "\ | 15 | SRC_URI = "\ |
8 | ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ | 16 | ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ |
9 | file://tcl-add-soname.patch;patch=1;pnum=2" | 17 | file://tcl-add-soname.patch" |
10 | 18 | ||
11 | S = "${WORKDIR}/tcl${PV}/unix" | 19 | S = "${WORKDIR}/tcl${PV}/unix" |
12 | 20 | ||
@@ -25,8 +33,8 @@ do_compile_prepend() { | |||
25 | 33 | ||
26 | do_install() { | 34 | do_install() { |
27 | autotools_do_install | 35 | autotools_do_install |
28 | oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} | 36 | oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR} |
29 | ln -sf ./tclsh8.4 ${D}${bindir}/tclsh | 37 | ln -sf ./tclsh8.5 ${D}${bindir}/tclsh |
30 | sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh | 38 | sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh |
31 | sed -i "s,-L${libdir},," tclConfig.sh | 39 | sed -i "s,-L${libdir},," tclConfig.sh |
32 | install -d ${STAGING_BINDIR_CROSS}/ | 40 | install -d ${STAGING_BINDIR_CROSS}/ |
@@ -40,8 +48,8 @@ do_install() { | |||
40 | } | 48 | } |
41 | 49 | ||
42 | PACKAGES =+ "${PN}-lib" | 50 | PACKAGES =+ "${PN}-lib" |
43 | FILES_${PN}-lib = "${libdir}/libtcl8.4.so.*" | 51 | FILES_${PN}-lib = "${libdir}/libtcl8.5.so.*" |
44 | FILES_${PN} += "${libdir}/tcl8.4" | 52 | FILES_${PN} += "${libdir}/tcl8.5" |
45 | FILES_${PN}-dev += "${libdir}/tclConfig.sh" | 53 | FILES_${PN}-dev += "${libdir}/tclConfig.sh" |
46 | 54 | ||
47 | BBCLASSEXTEND = "native" | 55 | BBCLASSEXTEND = "native" |