mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-12 06:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpm_5.4.9.bb: fix builds on systems with older libc

Browse Source 
| 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>
This commit is contained in:
Matthew McClintock
2012-07-10 12:14:20 -05:00
committed by Richard Purdie
parent e5d3ed3e6e
commit 659220973f
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-devtools/rpm/rpm/dbconvert.patch Normal file
View File

@@ -0,0 +1,27 @@
Upstream-Status: Not applicable
Hack to prevent unneeded demo app from building on older libc
where it will break the build
Index: rpm-5.4.9/tools/Makefile.am
===================================================================
--- rpm-5.4.9.orig/tools/Makefile.am
+++ rpm-5.4.9/tools/Makefile.am
@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS)
EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
-EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \
+EXTRA_PROGRAMS = augtool cudftool debugedit \
nix-build nix-channel nix-collect-garbage nix-copy-closure \
nix-env nix-hash nix-install-package nix-instantiate \
nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \
rpmcache rpmdigest rpmrepo rpmspecdump \
rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
if WITH_DB
-pkgbin_PROGRAMS += dbconvert
+pkgbin_PROGRAMS +=
endif
dist_man_MANS = rpmgrep.1

3
meta/recipes-devtools/rpm/rpm_5.4.9.bb
View File

@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "libpcre attr acl popt ossp-uuid file"
PR = "r45"
PR = "r46"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# 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
file://uclibc-support.patch \
file://rpmatch.patch \
file://fstack-protector-configure-check.patch \
file://dbconvert.patch \
"
SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"