diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-08-25 22:10:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-08-25 22:10:51 +0000 |
| commit | fc2e56f8b247337ae14448e8dba6c00a095a9f64 (patch) | |
| tree | 8aa06e4b87ac6ad8a7bc7a4b1d4288379d261790 | |
| parent | 85efc571d5da08e4af3e84eb63b6854148e7f105 (diff) | |
| download | openembedded-core-fc2e56f8b247337ae14448e8dba6c00a095a9f64.tar.gz openembedded-core-fc2e56f8b247337ae14448e8dba6c00a095a9f64.tar.bz2 openembedded-core-fc2e56f8b247337ae14448e8dba6c00a095a9f64.tar.xz openembedded-core-fc2e56f8b247337ae14448e8dba6c00a095a9f64.zip | |
rpm: Tweak patches to remove popt problem
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5103 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/rpm/files/cross_libpaths.patch | 11 | ||||
| -rw-r--r-- | meta/packages/rpm/rpm-native_4.4.2.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/rpm/rpm_4.4.2.3.bb | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/meta/packages/rpm/files/cross_libpaths.patch b/meta/packages/rpm/files/cross_libpaths.patch index 798db15cf..9e8f7dca8 100644 --- a/meta/packages/rpm/files/cross_libpaths.patch +++ b/meta/packages/rpm/files/cross_libpaths.patch @@ -117,7 +117,7 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h Index: rpm-4.4.2.3/Makefile.am =================================================================== --- rpm-4.4.2.3.orig/Makefile.am 2008-04-01 08:28:21.000000000 +0100 -+++ rpm-4.4.2.3/Makefile.am 2008-08-23 12:07:29.000000000 +0100 ++++ rpm-4.4.2.3/Makefile.am 2008-08-25 23:09:40.000000000 +0100 @@ -10,7 +10,7 @@ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmpopt-$(VERSION) rpmqv.c @@ -127,6 +127,15 @@ Index: rpm-4.4.2.3/Makefile.am INCLUDES = \ -I$(top_srcdir)/build \ +@@ -93,7 +93,7 @@ + rpm2cpio_LDFLAGS = $(myLDFLAGS) + rpm2cpio_LDADD = $(myLDADD) @LIBMISC@ + +-$(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@ ++$(PROGRAMS): @WITH_APIDOCS_TARGET@ + + .PHONY: splint + splint: Index: rpm-4.4.2.3/rpmdb/Makefile.am =================================================================== --- rpm-4.4.2.3.orig/rpmdb/Makefile.am 2008-04-01 08:28:22.000000000 +0100 diff --git a/meta/packages/rpm/rpm-native_4.4.2.3.bb b/meta/packages/rpm/rpm-native_4.4.2.3.bb index 517b571db..2e949dcd2 100644 --- a/meta/packages/rpm/rpm-native_4.4.2.3.bb +++ b/meta/packages/rpm/rpm-native_4.4.2.3.bb @@ -3,7 +3,5 @@ inherit native DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" -PR = "r2" - export sharedstatedir = "${layout_sharedstatedir}" export localstatedir = "${layout_localstatedir}" diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb index 7edecbcba..4e868e371 100644 --- a/meta/packages/rpm/rpm_4.4.2.3.bb +++ b/meta/packages/rpm/rpm_4.4.2.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager." HOMEPAGE = "http://rpm.org/" LICENSE = "LGPL GPL" DEPENDS = "zlib beecrypt file popt python" -PR = "r3" +PR = "r4" SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ file://external-tools.patch;patch=1 \ |