From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Matthew McClintock <msm@freescale.com>
Subject: Re: [PATCH] rpm_5.4.9.bb: fix builds on systems with older libc
Date: Tue, 17 Jul 2012 08:57:52 -0700 [thread overview]
Message-ID: <50058B80.4090608@linux.intel.com> (raw)
In-Reply-To: <1341940460-5784-1-git-send-email-msm@freescale.com>
On 07/10/2012 10:14 AM, Matthew McClintock wrote:
> | 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'
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> meta/recipes-devtools/rpm/rpm/dbconvert.patch | 27 +++++++++++++++++++++++++
> meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 ++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-devtools/rpm/rpm/dbconvert.patch
>
Merged into OE-Core
Thanks
Sau!
> diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
> new file mode 100644
> index 0000000..27dba8c
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
> @@ -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
> +
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> index 6ef1aae..e276cc3 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"
> 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"
>
next prev parent reply other threads:[~2012-07-17 16:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 17:14 [PATCH] rpm_5.4.9.bb: fix builds on systems with older libc Matthew McClintock
2012-07-17 15:57 ` Saul Wold [this message]
2012-07-19 15:40 ` Saul Wold
2012-07-19 16:02 ` McClintock Matthew-B29882
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50058B80.4090608@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=msm@freescale.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox