summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo/pseudo/oe-config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo/oe-config.patch')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/oe-config.patch58
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 @@
1configure: Fix configuration to match OE-Core requirements
2
3In OE-Core we need to be able to configure for both 32-bit and 64-bit libpseudo
4libraries. In order to avoid some complex manipulations, we adjust the configure
5and Makefile to facilitate this.
6
7Upstream-Status: Submitted
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff --git a/Makefile.in b/Makefile.in
12index 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)
24diff --git a/configure b/configure
25index 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