summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-02-03 18:54:58 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-07 16:52:40 +0000
commit5ade6c7de84893b4f94f7c068d775beeaecb9f5f (patch)
treeead6c182a65ea29908fee35de112a5dc5f3fdf34
parent7586adb360d8075d3e97184dfcafb1b13ce5f838 (diff)
downloadpoky-5ade6c7de84893b4f94f7c068d775beeaecb9f5f.tar.gz
pseudo: Uprev pseudo and fix a few minor bugs
Uprev pseudo to the latest version. This corrects a linking problem on some newer host systems. In addition, we add more detail to the local.conf.sample file to explain the NO32LIBS and why someone would set it to 0. Also fix a minor bug in pseudo that prevented it from building for the target. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/conf/local.conf.sample9
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch18
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb38
4 files changed, 52 insertions, 15 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index db72140a0e..f7ee1c04d0 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -152,7 +152,7 @@ PRELINKSRCREV ??= "909470ee441237563d6236c505cb2d02ddc48704"
152SRCREV_pn-prelink ??= "${PRELINKSRCREV}" 152SRCREV_pn-prelink ??= "${PRELINKSRCREV}"
153SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" 153SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}"
154SRCREV_pn-psplash ??= "424" 154SRCREV_pn-psplash ??= "424"
155PSEUDOSRCREV ??= "bcb42d80c0817da5479ab9c4f2cd8c4727e98ef8" 155PSEUDOSRCREV ??= "5434325fc887817ebb2bad36313d8277992cef1d"
156SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" 156SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}"
157SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" 157SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}"
158SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}" 158SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}"
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index f9953d1cee..8ac31d8f77 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -170,6 +170,15 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
170#IMAGE_LINGUAS ?= "en-gb" 170#IMAGE_LINGUAS ?= "en-gb"
171#LIMIT_BUILT_LOCALES ?= "POSIX en_GB" 171#LIMIT_BUILT_LOCALES ?= "POSIX en_GB"
172 172
173# This value is currently used by PSEUDO to determine if the recipe should
174# build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system.
175#
176# PSEUDO will attempt to determine if a 32-bit wrapper is necessary, but
177# it doesn't always guess properly. If you have 32-bit executables on
178# your 64-bit build system, you likely want to set this to "0",
179# otherwise you could end up with incorrect file attributes on the
180# target filesystem.
181#
173# Default to not build 32 bit libs on 64 bit systems, comment this 182# Default to not build 32 bit libs on 64 bit systems, comment this
174# out if that is desired 183# out if that is desired
175NO32LIBS = "1" 184NO32LIBS = "1"
diff --git a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
index 0a2fa28d79..6faa7a2a44 100644
--- a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
+++ b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch
@@ -2,14 +2,14 @@ Due to disabling the LD_LIBRARY_PATH handling, we need to use a static
2libsqlite. 2libsqlite.
3 3
4diff -ur git.orig/Makefile.in git/Makefile.in 4diff -ur git.orig/Makefile.in git/Makefile.in
5--- git.orig/Makefile.in 2010-07-20 17:13:56.000000000 -0700 5--- git.orig/Makefile.in
6+++ git/Makefile.in 2010-07-20 17:12:14.000000000 -0700 6+++ git/Makefile.in
7@@ -45,7 +45,7 @@ 7@@ -55,7 +55,7 @@
8 GLOB_PATTERN=guts/*.c
9 GUTS=$(filter-out "$(GLOB_PATTERN)",$(wildcard $(GLOB_PATTERN)))
10 8
11-DBLDFLAGS=-lsqlite3 9 # needed for anything that links with pseduo_client.o, pretty much
12+DBLDFLAGS=$(SQLITE)/lib/libsqlite3.a 10 CLIENT_LDFLAGS=-ldl -lpthread
13 USE_64=wrapfuncs64.in 11-DB_LDFLAGS=-lsqlite3 -lpthread
12+DB_LDFLAGS=$(SQLITE)/lib/libsqlite3.a -lpthread
14 13
15 SHOBJS=pseudo_table.o pseudo_util.o 14 PSEUDO=$(BIN)/pseudo
15 PSEUDODB=$(BIN)/pseudodb
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 4e94df7e8c..244fabe1eb 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL2.1"
6DEPENDS = "sqlite3" 6DEPENDS = "sqlite3"
7 7
8PV = "0.0+git${SRCPV}" 8PV = "0.0+git${SRCPV}"
9PR = "r17" 9PR = "r18"
10 10
11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ 11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
12 file://static_sqlite.patch \ 12 file://static_sqlite.patch \
@@ -25,7 +25,26 @@ do_configure () {
25 25
26NO32LIBS ??= "0" 26NO32LIBS ??= "0"
27 27
28# Compile for the local machine arch...
28do_compile () { 29do_compile () {
30 ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
31 oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
32}
33
34# Two below are the same
35# If necessary compile for the alternative machine arch. This is only
36# necessary in a native build.
37do_compile_prepend_virtclass-native () {
38 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
39 # We need the 32-bit libpseudo on a 64-bit machine...
40 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
41 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
42 # prevent it from removing the lib, but remove everything else
43 make 'LIB=foo' distclean
44 fi
45}
46
47do_compile_prepend_virtclass-nativesdk () {
29 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 48 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
30 # We need the 32-bit libpseudo on a 64-bit machine... 49 # We need the 32-bit libpseudo on a 64-bit machine...
31 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 50 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
@@ -33,18 +52,27 @@ do_compile () {
33 # prevent it from removing the lib, but remove everything else 52 # prevent it from removing the lib, but remove everything else
34 make 'LIB=foo' distclean 53 make 'LIB=foo' distclean
35 fi 54 fi
36 ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
37 oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
38} 55}
39 56
40do_install () { 57do_install () {
41 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install 58 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install
59}
60
61# Two below are the same
62# If necessary install for the alternative machine arch. This is only
63# necessary in a native build.
64do_install_append_virtclass-native () {
42 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 65 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
43 mkdir -p ${D}${prefix}/lib/pseudo/lib 66 mkdir -p ${D}${prefix}/lib/pseudo/lib
44 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. 67 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
45 fi 68 fi
46} 69}
47 70
48BBCLASSEXTEND = "native nativesdk" 71do_install_append_virtclass-nativesdk () {
49 72 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
73 mkdir -p ${D}${prefix}/lib/pseudo/lib
74 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
75 fi
76}
50 77
78BBCLASSEXTEND = "native nativesdk"