From c647c7a54cf28c2fc76158095920ff6c7bf6adbc Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 2 Jun 2011 17:15:26 -0500 Subject: pseudo: Update pseudo to 1.1.1 version Update both the core and pseudo_git packages to the latest 1.1.1 verison. This fixes an issues where the call system() was not wrapped. This could lead to issues where certain spawned commands broke out of a pseudo-chroot and created files in the wrong place. Also the update the 1.0 -> 1.1.1 adds additional capabilities such as beginning support for MacOS X. (From OE-Core rev: 9eaa9ed38a197be76317cd3e42f54d1808c3e971) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- .../recipes-devtools/pseudo/pseudo/oe-config.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/pseudo/oe-config.patch (limited to 'meta/recipes-devtools/pseudo/pseudo') diff --git a/meta/recipes-devtools/pseudo/pseudo/oe-config.patch b/meta/recipes-devtools/pseudo/pseudo/oe-config.patch new file mode 100644 index 0000000000..d368281ce5 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo/oe-config.patch @@ -0,0 +1,58 @@ +configure: Fix configuration to match OE-Core requirements + +In OE-Core we need to be able to configure for both 32-bit and 64-bit libpseudo +libraries. In order to avoid some complex manipulations, we adjust the configure +and Makefile to facilitate this. + +Upstream-Status: Submitted + +Signed-off-by: Mark Hatle + +diff --git a/Makefile.in b/Makefile.in +index 6c57d43..342d066 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ MARK64=@MARK64@ + RPATH=@RPATH@ + VERSION=1.1.1 + +-LIB=$(shell basename $(LIBDIR)) ++LIB=@LIB@ + BIN=bin + LOCALSTATE=var/pseudo + BINDIR=$(PREFIX)/$(BIN) +diff --git a/configure b/configure +index 9a480fb..eeb19f3 100755 +--- a/configure ++++ b/configure +@@ -80,14 +80,18 @@ if [ -z "$opt_prefix" ]; then + usage + fi + +-if [ -n "$opt_bits" ] && [ -n "$opt_libdir" ]; then +- echo >&2 "Can not specify both --libdir and --bits" +- exit 1 +-fi + if [ -z "$opt_libdir" ]; then + opt_libdir=$opt_prefix/lib$opt_mark64 + fi + ++# We need to find the libdir relative to the prefix, this is required ++# by the code in pseudo-utils.c that handles relocation. ++opt_lib=${opt_libdir#$opt_prefix/} ++if [ "$opt_lib" = "$opt_libdir" ]; then ++ echo >&2 "libdir must be relative to prefix." ++ exit 1 ++fi ++ + if [ ! -f "${opt_sqlite}/include/sqlite3.h" ]; then + echo >&2 "SQLite3 headers not found in at ${opt_sqlite}/include/sqlite3.h. Please check that SQLite3 and SQLite3 headers are installed." + exit 1 +@@ -107,6 +111,7 @@ fi + sed -e ' + s,@PREFIX@,'"$opt_prefix"',g + s,@LIBDIR@,'"$opt_libdir"',g ++ s,@LIB@,'"$opt_lib"',g + s,@SUFFIX@,'"$opt_suffix"',g + s,@SQLITE@,'"$opt_sqlite"',g + s!@RPATH@!'"$opt_rpath"'!g -- cgit v1.2.3-54-g00ecf