diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-01-15 21:36:23 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-28 17:52:55 +0000 |
commit | f6ddba2a9dc15560f639faaba8233c29c0c37e9d (patch) | |
tree | 568c80749bdfd9c005c769bbb49b18a6b1390cff /meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | |
parent | a606ad5022e7c0ca34a5bc086254ac8ec16bc8c7 (diff) | |
download | poky-f6ddba2a9dc15560f639faaba8233c29c0c37e9d.tar.gz |
rpm: Uprev to RPM 5.4.0
Update RPM to the latest release, RPM 5.4.0.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch new file mode 100644 index 0000000000..829399c95e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | During installation, the libtool relink attempts to link to -lrpm... | ||
2 | The problem is that it hasn't been installed yet! So small change causes | ||
3 | the libtool to instead use the build version. | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | --- rpm-5.4.0/lib/Makefile.am.orig | ||
8 | +++ rpm-5.4.0/lib/Makefile.am | ||
9 | @@ -90,6 +90,9 @@ | ||
10 | libsql_la_SOURCES = libsql.c | ||
11 | libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON) | ||
12 | |||
13 | +# pkglib libraries needs to have usrlib libraries already installed! | ||
14 | +install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES | ||
15 | + | ||
16 | install-data-hook: | ||
17 | if !ENABLE_BUILD_LAFILES | ||
18 | -for l in $(usrlib_LTLIBRARIES); do \ | ||