diff options
Diffstat (limited to 'meta/packages')
-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 798db15cf0..9e8f7dca82 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 | |||
117 | Index: rpm-4.4.2.3/Makefile.am | 117 | Index: rpm-4.4.2.3/Makefile.am |
118 | =================================================================== | 118 | =================================================================== |
119 | --- rpm-4.4.2.3.orig/Makefile.am 2008-04-01 08:28:21.000000000 +0100 | 119 | --- rpm-4.4.2.3.orig/Makefile.am 2008-04-01 08:28:21.000000000 +0100 |
120 | +++ rpm-4.4.2.3/Makefile.am 2008-08-23 12:07:29.000000000 +0100 | 120 | +++ rpm-4.4.2.3/Makefile.am 2008-08-25 23:09:40.000000000 +0100 |
121 | @@ -10,7 +10,7 @@ | 121 | @@ -10,7 +10,7 @@ |
122 | po/*.in po/*.po po/rpm.pot \ | 122 | po/*.in po/*.po po/rpm.pot \ |
123 | rpm.magic rpmpopt-$(VERSION) rpmqv.c | 123 | rpm.magic rpmpopt-$(VERSION) rpmqv.c |
@@ -127,6 +127,15 @@ Index: rpm-4.4.2.3/Makefile.am | |||
127 | 127 | ||
128 | INCLUDES = \ | 128 | INCLUDES = \ |
129 | -I$(top_srcdir)/build \ | 129 | -I$(top_srcdir)/build \ |
130 | @@ -93,7 +93,7 @@ | ||
131 | rpm2cpio_LDFLAGS = $(myLDFLAGS) | ||
132 | rpm2cpio_LDADD = $(myLDADD) @LIBMISC@ | ||
133 | |||
134 | -$(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@ | ||
135 | +$(PROGRAMS): @WITH_APIDOCS_TARGET@ | ||
136 | |||
137 | .PHONY: splint | ||
138 | splint: | ||
130 | Index: rpm-4.4.2.3/rpmdb/Makefile.am | 139 | Index: rpm-4.4.2.3/rpmdb/Makefile.am |
131 | =================================================================== | 140 | =================================================================== |
132 | --- rpm-4.4.2.3.orig/rpmdb/Makefile.am 2008-04-01 08:28:22.000000000 +0100 | 141 | --- 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 517b571db5..2e949dcd24 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 | |||
3 | 3 | ||
4 | DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" | 4 | DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" |
5 | 5 | ||
6 | PR = "r2" | ||
7 | |||
8 | export sharedstatedir = "${layout_sharedstatedir}" | 6 | export sharedstatedir = "${layout_sharedstatedir}" |
9 | export localstatedir = "${layout_localstatedir}" | 7 | 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 7edecbcba6..4e868e3716 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." | |||
2 | HOMEPAGE = "http://rpm.org/" | 2 | HOMEPAGE = "http://rpm.org/" |
3 | LICENSE = "LGPL GPL" | 3 | LICENSE = "LGPL GPL" |
4 | DEPENDS = "zlib beecrypt file popt python" | 4 | DEPENDS = "zlib beecrypt file popt python" |
5 | PR = "r3" | 5 | PR = "r4" |
6 | 6 | ||
7 | SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ | 7 | SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ |
8 | file://external-tools.patch;patch=1 \ | 8 | file://external-tools.patch;patch=1 \ |