summaryrefslogtreecommitdiff
path: root/packages/tcltk
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-09-25 14:28:40 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-25 14:28:40 +0000
commitc5ad04d9323ce0152ec164ec4f38af0004ed1b0d (patch)
tree706f666231160ae1211b1be0ddffa4e6541942bc /packages/tcltk
parent77dede6a85eb8aef312802c3029c27b7f5bf0720 (diff)
tcl/tk: add SONAME patches, ship .so in $PN, not $PN-dev
Diffstat (limited to 'packages/tcltk')
-rw-r--r--packages/tcltk/files/tcl-add-soname.patch12
-rw-r--r--packages/tcltk/files/tk-add-soname.patch12
-rw-r--r--packages/tcltk/tcl_8.4.11.bb7
-rw-r--r--packages/tcltk/tk_8.4.11.bb8
4 files changed, 33 insertions, 6 deletions
diff --git a/packages/tcltk/files/tcl-add-soname.patch b/packages/tcltk/files/tcl-add-soname.patch
new file mode 100644
index 0000000000..fe02736005
--- /dev/null
+++ b/packages/tcltk/files/tcl-add-soname.patch
@@ -0,0 +1,12 @@
+diff -u tcl8.3.5/unix/tcl.m4~ tcl8.3.5/unix/tcl.m4
+--- unix/tcl.m4~ 2003-01-14 20:42:53.000000000 +0900
++++ unix/tcl.m4 2003-01-14 20:42:53.000000000 +0900
+@@ -954,7 +954,7 @@
+ CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+
+ if test "$have_dl" = yes; then
+- SHLIB_LD="${CC} -shared"
++ SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="-rdynamic"
diff --git a/packages/tcltk/files/tk-add-soname.patch b/packages/tcltk/files/tk-add-soname.patch
new file mode 100644
index 0000000000..31702ca2a9
--- /dev/null
+++ b/packages/tcltk/files/tk-add-soname.patch
@@ -0,0 +1,12 @@
+diff -u tk8.3.5/unix/tcl.m4~ tk8.3.5/unix/tcl.m4
+--- unix/tcl.m4~ 2003-01-14 21:22:12.000000000 +0900
++++ unix/tcl.m4 2003-01-14 21:22:12.000000000 +0900
+@@ -949,7 +949,7 @@
+ CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+
+ if test "$have_dl" = yes; then
+- SHLIB_LD="${CC} -shared"
++ SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="-rdynamic"
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb
index e56982aac8..0851cbd165 100644
--- a/packages/tcltk/tcl_8.4.11.bb
+++ b/packages/tcltk/tcl_8.4.11.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Tool Command Language"
LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-PR = "r1"
+PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
+ file://tcl-add-soname.patch;patch=1"
S = "${WORKDIR}/tcl${PV}/unix"
inherit autotools
@@ -41,4 +42,4 @@ do_install() {
ln -sf ./tclsh8.4 ${D}${bindir}/tclsh
}
-FILES_${PN} += "${libdir}/tcl8.4"
+FILES_${PN} += "${libdir}/tcl8.4 ${libdir}/libtcl8.4.so"
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index b76d6670f2..ed72f336da 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -3,10 +3,12 @@ LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
DEPENDS = "tcl x11"
-PR = "r1"
+RDEPENDS = "tcl"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
- file://disable-xim.patch;patch=1;pnum=0"
+ file://disable-xim.patch;patch=1;pnum=0 \
+ file://tk-add-soname.patch;patch=1"
S = "${WORKDIR}/tk${PV}/unix"
inherit autotools
@@ -41,4 +43,4 @@ do_install() {
ln -sf ./wish8.4 ${D}${bindir}/wish
}
-FILES_${PN} += "${libdir}/tk8.4"
+FILES_${PN} += "${libdir}/tk8.4 ${libdir}/libtk8.4.so"