summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch20
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb11
2 files changed, 28 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
new file mode 100644
index 0000000000..1f4ba980b1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
@@ -0,0 +1,20 @@
1Fix integration of ossp-uuid
2
3We need to avoid including the util-linux uuid library, instead
4we need ossp-uuid. There is a related hack in do_configure to
5make sure that we use the right .pc file as well.
6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8
9diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
10--- rpm-5.4.9.orig/configure.ac 2012-05-17 16:37:20.594790192 -0500
11+++ rpm-5.4.9/configure.ac 2012-05-17 16:39:23.126933596 -0500
12@@ -1909,7 +1909,7 @@
13 esac
14 RPM_CHECK_LIB(
15 [OSSP uuid], [uuid],
16- [ossp-uuid uuid], [uuid_import], [uuid.h],
17+ [ossp-uuid], [uuid_import], [uuid.h],
18 [no,external:none], [],
19 [ dnl # enable OSSP uuid native API support for embedded Lua
20 if test ".$WITH_LUA" = .yes; then
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 6eba802d8a..2ca0f58ff0 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -42,8 +42,8 @@ HOMEPAGE = "http://rpm5.org/"
42LICENSE = "LGPLv2.1" 42LICENSE = "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 file" 45DEPENDS = "libpcre attr acl popt ossp-uuid file"
46PR = "r40" 46PR = "r41"
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...
@@ -69,6 +69,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
69 file://rpm-no-perl-urpm.patch \ 69 file://rpm-no-perl-urpm.patch \
70 file://rpm-macros.patch \ 70 file://rpm-macros.patch \
71 file://rpm-lua.patch \ 71 file://rpm-lua.patch \
72 file://rpm-ossp-uuid.patch \
72 " 73 "
73 74
74SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 75SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"
@@ -145,7 +146,7 @@ EXTRA_OECONF += "--verbose \
145 --without-gnutls \ 146 --without-gnutls \
146 --with-pcre \ 147 --with-pcre \
147 --enable-utf8 \ 148 --enable-utf8 \
148 --without-uuid \ 149 --with-uuid \
149 --with-attr \ 150 --with-attr \
150 --with-acl \ 151 --with-acl \
151 --with-popt=external \ 152 --with-popt=external \
@@ -330,6 +331,10 @@ do_configure() {
330 331
331 ./autogen.sh 332 ./autogen.sh
332 333
334 # NASTY hack to make sure configure files the right pkg-config file...
335 sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
336 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure
337
333 export varprefix=${localstatedir} 338 export varprefix=${localstatedir}
334 export CC_FOR_BUILD="${BUILD_CC}" 339 export CC_FOR_BUILD="${BUILD_CC}"
335 oe_runconf 340 oe_runconf