diff options
author | Peter Seebach <peter.seebach@windriver.com> | 2012-03-27 16:57:30 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-28 10:10:56 +0100 |
commit | c718c10b4b323bdae9f788300110111d61b0d1a3 (patch) | |
tree | bf1e9b92f6d553d0a18312da6e75972eae360f06 /meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch | |
parent | 0ba97b4274d576196c77668981065d1b8fe74f45 (diff) | |
download | poky-c718c10b4b323bdae9f788300110111d61b0d1a3.tar.gz |
Pseudo: Update to 1.3
The various local patches have made it into upstream, so we update
the build files and jump to pseudo 1.3. This also includes a popen()
fix which fixes some edge cases that caused failures trying to check
git branches and the like.
[Yocto bug #2181]
(From OE-Core rev: 0b007519fcfb1bcf2be9cad40b0f6265f8798518)
Signed-off-by: Seebs <peter.seebach@windriver.com>
Updated the pseudo_git.bb to match.
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/static_sqlite.patch')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch deleted file mode 100644 index f9223a86ae..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Due to disabling the LD_LIBRARY_PATH handling, we need to use a static | ||
2 | libsqlite. | ||
3 | |||
4 | Upstream-Status: Inappropriate [configuration] | ||
5 | |||
6 | diff -ur git.orig/Makefile.in git/Makefile.in | ||
7 | --- git.orig/Makefile.in | ||
8 | +++ git/Makefile.in | ||
9 | @@ -55,7 +55,7 @@ | ||
10 | |||
11 | # needed for anything that links with pseduo_client.o, pretty much | ||
12 | CLIENT_LDFLAGS=-ldl -lpthread | ||
13 | -DB_LDFLAGS=-lsqlite3 -lpthread | ||
14 | +DB_LDFLAGS=$(SQLITE)/lib/libsqlite3.a -lpthread | ||
15 | |||
16 | PSEUDO=$(BIN)/pseudo | ||
17 | PSEUDODB=$(BIN)/pseudodb | ||