mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

rpm: Tweak patches to remove popt problem

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5103 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-08-25 22:10:51 +00:00
parent 85efc571d5
commit fc2e56f8b2
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/rpm/files/cross_libpaths.patch
+10 -1
View File
@@ -117,7 +117,7 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
Index: rpm-4.4.2.3/Makefile.am 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.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 @@ @@ -10,7 +10,7 @@
po/*.in po/*.po po/rpm.pot \ po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.magic rpmpopt-$(VERSION) rpmqv.c
@@ -127,6 +127,15 @@ Index: rpm-4.4.2.3/Makefile.am
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/build \ -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 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 --- rpm-4.4.2.3.orig/rpmdb/Makefile.am 2008-04-01 08:28:22.000000000 +0100
meta/packages/rpm/rpm-native_4.4.2.3.bb
-2
View File
@@ -3,7 +3,5 @@ inherit native
DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
PR = "r2"
export sharedstatedir = "${layout_sharedstatedir}" export sharedstatedir = "${layout_sharedstatedir}"
export localstatedir = "${layout_localstatedir}" export localstatedir = "${layout_localstatedir}"
meta/packages/rpm/rpm_4.4.2.3.bb
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
HOMEPAGE = "http://rpm.org/" HOMEPAGE = "http://rpm.org/"
LICENSE = "LGPL GPL" LICENSE = "LGPL GPL"
DEPENDS = "zlib beecrypt file popt python" 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 \ SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
file://external-tools.patch;patch=1 \ file://external-tools.patch;patch=1 \