prelink & vte fixes

From: Nitin A Kamble <[email protected]>

The vte commit is redone to avoid adding introspection package in DEPENDS.

Thanks,
Nitin

The following changes since commit 0ff1d667dc23b0cc903c18f1b5e032c2b6630aae:

distro: Add poky-tiny distro definition (2012-01-03 21:33:15 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/work
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/work

Nitin A Kamble (2):
prelink: also look at nonstandard lib paths
vte: upgrade from 0.24.3 to 0.28.2

 meta/recipes-devtools/prelink/prelink/prelink.conf |    8 +-
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 meta/recipes-support/vte/vte.inc                   |    6 +-
 meta/recipes-support/vte/vte/introspection.patch   |   99 ++++++++++++++++++++
 meta/recipes-support/vte/vte_0.24.3.bb             |    8 --
 meta/recipes-support/vte/vte_0.28.2.bb             |    8 ++
 6 files changed, 116 insertions(+), 15 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/introspection.patch
 delete mode 100644 meta/recipes-support/vte/vte_0.24.3.bb
 create mode 100644 meta/recipes-support/vte/vte_0.28.2.bb

1.7.4.4

From: Nitin A Kamble <[email protected]>

Prelinking for x32 image showed that it was ignoring libraries located at locations like /usr/libx32. Like that mips n32 has library locations set as lib32
This commit modifies prelink.conf to look at libraries also
located at libx32 & lib32 locations.
Thanks to Mark Hatle for suggesting the fix.

---
 meta/recipes-devtools/prelink/prelink/prelink.conf |    8 ++++----
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

index ed30c28..562f23c 100644
@@ -12,7 +12,7 @@
 -l /usr/bin
 -l /usr/X11R6/bin
 -l /usr/games
--l /usr/local/lib{,64}
--l /lib{,64}
--l /usr/lib{,64}
--l /usr/X11R6/lib{,64}
+-l /usr/local/lib{,32,64,x32}
+-l /lib{,32,64,x32}
+-l /usr/lib{,32,64,x32}
+-l /usr/X11R6/lib{,32,64,x32}

index 31c22ef..17141e9 100644
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 SRCREV = "bb1b660c5e3859b6c5a2ac8d739713e9989a4dd7"
 PV = "1.0+git${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 #
 # The cron script attempts to re-prelink the system daily -- on

1.7.4.4

From: Nitin A Kamble <[email protected]>

Added a patch to add introspection.m4 to avoid the following configure error:

| src/Makefile.am:168: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
| autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed.
NOTE: package vte-0.28.2-r0: task do_configure: Failed

This upgrade avoids configure issues with automake version 1.11.2 seen on the earlier version of vte:

| src/Makefile.am:155: pkglibdir' is not a legitimate directory for PROGRAMS'
| src/Makefile.am:156: pkglibdir' is not a legitimate directory for SCRIPTS'
| src/Makefile.am:178: variable `interpret_SOURCES' is defined but no program or
| src/Makefile.am:178: library has `interpret' as canonical name (possible typo)
| src/Makefile.am:229: variable `slowcat_SOURCES' is defined but no program or
| src/Makefile.am:229: library has `slowcat' as canonical name (possible typo)
| src/Makefile.am:203: variable `interpret_LDADD' is defined but no program or
| src/Makefile.am:203: library has `interpret' as canonical name (possible typo)
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
NOTE: package vte-0.24.3-r0: task do_configure: Failed

Did not upgrade to the latest version 0.31.0.
0.28.2 is the last version supporting gtk+ 2. Next versions have dropped support for gtk+ 2, and they require gtk+ 3. It would be more appropriate to move to next version after gtk+ 3 recipe is available.

---
 meta/recipes-support/vte/vte.inc                 |    6 +-
 meta/recipes-support/vte/vte/introspection.patch |   99 ++++++++++++++++++++++
 meta/recipes-support/vte/vte_0.24.3.bb           |    8 --
 meta/recipes-support/vte/vte_0.28.2.bb           |    8 ++
 4 files changed, 111 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/introspection.patch
 delete mode 100644 meta/recipes-support/vte/vte_0.24.3.bb
 create mode 100644 meta/recipes-support/vte/vte_0.28.2.bb

index 6138f8c..54bd8ae 100644
@@ -6,9 +6,11 @@ RDEPENDS_libvte = "vte-termcap"
 
 inherit gnome
 
-EXTRA_OECONF = "--disable-gtk-doc --disable-python"
+SRC_URI += "file://introspection.patch"
+
+EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
 
 PACKAGES =+ "libvte vte-termcap"
 FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
 FILES_vte-dbg =+ ${libexecdir}/.debug"
-FILES_vte-termcap = "${datadir}/vte/termcap"
+FILES_vte-termcap = "${datadir}/vte/termcap-0.0"

deleted file mode 100644
index c06dd53..0000000
@@ -1,8 +0,0 @@
-require vte.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-PR = "r0"
-
-SRC_URI[archive.md5sum] = "3eba555eab7ccbbe5ca056bb203a14ab"
-SRC_URI[archive.sha256sum] = "fe7d01178976b17ca809e41d0e6dbbcb28e2af5e2f5aa857f9df65affac17d01"

new file mode 100644
index 0000000..c74419a
@@ -0,0 +1,8 @@
+require vte.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r0"
+
+SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
+SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"

1.7.4.4

Merged to master, thanks.

Richard