diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-02 17:15:26 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-09 15:48:27 +0100 |
commit | c647c7a54cf28c2fc76158095920ff6c7bf6adbc (patch) | |
tree | 11e2ee136911dd05180b407a5e6a847d50982c61 /meta/recipes-devtools/pseudo/pseudo | |
parent | a91d4987faf2282c7383f630707ade7b9799def8 (diff) | |
download | poky-c647c7a54cf28c2fc76158095920ff6c7bf6adbc.tar.gz |
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 <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/oe-config.patch | 58 |
1 files changed, 58 insertions, 0 deletions
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 @@ | |||
1 | configure: Fix configuration to match OE-Core requirements | ||
2 | |||
3 | In OE-Core we need to be able to configure for both 32-bit and 64-bit libpseudo | ||
4 | libraries. In order to avoid some complex manipulations, we adjust the configure | ||
5 | and Makefile to facilitate this. | ||
6 | |||
7 | Upstream-Status: Submitted | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
10 | |||
11 | diff --git a/Makefile.in b/Makefile.in | ||
12 | index 6c57d43..342d066 100644 | ||
13 | --- a/Makefile.in | ||
14 | +++ b/Makefile.in | ||
15 | @@ -27,7 +27,7 @@ MARK64=@MARK64@ | ||
16 | RPATH=@RPATH@ | ||
17 | VERSION=1.1.1 | ||
18 | |||
19 | -LIB=$(shell basename $(LIBDIR)) | ||
20 | +LIB=@LIB@ | ||
21 | BIN=bin | ||
22 | LOCALSTATE=var/pseudo | ||
23 | BINDIR=$(PREFIX)/$(BIN) | ||
24 | diff --git a/configure b/configure | ||
25 | index 9a480fb..eeb19f3 100755 | ||
26 | --- a/configure | ||
27 | +++ b/configure | ||
28 | @@ -80,14 +80,18 @@ if [ -z "$opt_prefix" ]; then | ||
29 | usage | ||
30 | fi | ||
31 | |||
32 | -if [ -n "$opt_bits" ] && [ -n "$opt_libdir" ]; then | ||
33 | - echo >&2 "Can not specify both --libdir and --bits" | ||
34 | - exit 1 | ||
35 | -fi | ||
36 | if [ -z "$opt_libdir" ]; then | ||
37 | opt_libdir=$opt_prefix/lib$opt_mark64 | ||
38 | fi | ||
39 | |||
40 | +# We need to find the libdir relative to the prefix, this is required | ||
41 | +# by the code in pseudo-utils.c that handles relocation. | ||
42 | +opt_lib=${opt_libdir#$opt_prefix/} | ||
43 | +if [ "$opt_lib" = "$opt_libdir" ]; then | ||
44 | + echo >&2 "libdir must be relative to prefix." | ||
45 | + exit 1 | ||
46 | +fi | ||
47 | + | ||
48 | if [ ! -f "${opt_sqlite}/include/sqlite3.h" ]; then | ||
49 | echo >&2 "SQLite3 headers not found in at ${opt_sqlite}/include/sqlite3.h. Please check that SQLite3 and SQLite3 headers are installed." | ||
50 | exit 1 | ||
51 | @@ -107,6 +111,7 @@ fi | ||
52 | sed -e ' | ||
53 | s,@PREFIX@,'"$opt_prefix"',g | ||
54 | s,@LIBDIR@,'"$opt_libdir"',g | ||
55 | + s,@LIB@,'"$opt_lib"',g | ||
56 | s,@SUFFIX@,'"$opt_suffix"',g | ||
57 | s,@SQLITE@,'"$opt_sqlite"',g | ||
58 | s!@RPATH@!'"$opt_rpath"'!g | ||