summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-07-10 12:14:20 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:54 +0100
commit659220973f767453a5365e81b356956827dd1059 (patch)
tree8abcb21d91f4c28b17e30de7baf70d4846d704f5
parente5d3ed3e6e2b534629fa559f535a27d23d9e8364 (diff)
downloadpoky-659220973f767453a5365e81b356956827dd1059.tar.gz
rpm_5.4.9.bb: fix builds on systems with older libc
| dbconvert.o: In function `rpmdb_convert': | /local/jenkins/jobs/yocto-upstream/workspace/label/master/machine/p4080ds/poky/master/tmp/work/x86_64-linux/rpm-native-5.4.9-r45/rpm-5.4.9/tools/dbconvert.c:126: warning: the use of `tempnam' is dangerous, better use `mkstemp' | dbconvert.o: In function `main': | dbconvert.c:(.text+0x923): undefined reference to `htobe32' | dbconvert.c:(.text+0xaa4): undefined reference to `htole32' | dbconvert.c:(.text+0xac9): undefined reference to `htole32' (From OE-Core rev: add2c772cd404e8bea4828959fcb5ee33c35c048) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm/dbconvert.patch27
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
new file mode 100644
index 0000000000..27dba8c960
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Not applicable
2
3Hack to prevent unneeded demo app from building on older libc
4where it will break the build
5
6Index: rpm-5.4.9/tools/Makefile.am
7===================================================================
8--- rpm-5.4.9.orig/tools/Makefile.am
9+++ rpm-5.4.9/tools/Makefile.am
10@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS)
11
12 EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
13
14-EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \
15+EXTRA_PROGRAMS = augtool cudftool debugedit \
16 nix-build nix-channel nix-collect-garbage nix-copy-closure \
17 nix-env nix-hash nix-install-package nix-instantiate \
18 nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
19@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \
20 rpmcache rpmdigest rpmrepo rpmspecdump \
21 rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
22 if WITH_DB
23-pkgbin_PROGRAMS += dbconvert
24+pkgbin_PROGRAMS +=
25 endif
26 dist_man_MANS = rpmgrep.1
27
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 6ef1aae025..e276cc341b 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file" 45DEPENDS = "libpcre attr acl popt ossp-uuid file"
46PR = "r45" 46PR = "r46"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -75,6 +75,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
75 file://uclibc-support.patch \ 75 file://uclibc-support.patch \
76 file://rpmatch.patch \ 76 file://rpmatch.patch \
77 file://fstack-protector-configure-check.patch \ 77 file://fstack-protector-configure-check.patch \
78 file://dbconvert.patch \
78 " 79 "
79 80
80SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 81SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"