summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-14 14:51:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-14 15:05:30 +0000
commit3f1407457f405d2fdf8a3618141c6b76b2d2b2d1 (patch)
tree8de0f04ed0ac0728f59d8a8b21852a1c7bb14636 /meta
parent4fd512fce2542268d8cf9089df0ff906ed450337 (diff)
downloadpoky-3f1407457f405d2fdf8a3618141c6b76b2d2b2d1.tar.gz
ossp-uuid: fix out-of-tree builds
(From OE-Core rev: 79ad900cc693d4c02323cae0b31350b57eafa1e8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch19
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb13
2 files changed, 25 insertions, 7 deletions
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
new file mode 100644
index 0000000000..04222cbf7a
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
@@ -0,0 +1,19 @@
1uuid.pc is generated at build time so should be installed from the current
2directory, and not $S.
3
4Upstream-Status: Pending [should be submitted]
5Signed-Off-By: Ross Burton <ross.burton@intel.com>
6
7Index: uuid-1.6.2/Makefile.in
8===================================================================
9--- uuid-1.6.2.orig/Makefile.in 2012-11-13 16:58:28.624156000 +0000
10+++ uuid-1.6.2/Makefile.in 2012-11-13 17:05:24.224158670 +0000
11@@ -232,7 +232,7 @@
12 $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
13 $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
14 $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
15- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
16+ $(SHTOOL) install -c -m 644 uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
17 $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
18 -@if [ ".$(WITH_DCE)" = .yes ]; then \
19 echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index 7de0a58bd5..b6304f0135 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -15,7 +15,7 @@ LICENSE = "MIT"
15LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \ 15LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \
16 file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd" 16 file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd"
17 17
18PR = "r1" 18PR = "r2"
19 19
20SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \ 20SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
21 file://0001-Change-library-name.patch \ 21 file://0001-Change-library-name.patch \
@@ -24,6 +24,7 @@ SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
24 file://0004-fix-data-uuid-from-string.patch \ 24 file://0004-fix-data-uuid-from-string.patch \
25 file://uuid-libtool.patch \ 25 file://uuid-libtool.patch \
26 file://uuid-nostrip.patch \ 26 file://uuid-nostrip.patch \
27 file://install-pc.patch \
27 " 28 "
28SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" 29SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
29SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" 30SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
@@ -36,14 +37,12 @@ EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat
36EXTRA_OECONF = "--includedir=${includedir}/ossp" 37EXTRA_OECONF = "--includedir=${includedir}/ossp"
37 38
38do_configure_prepend() { 39do_configure_prepend() {
39 # This package has a completely custom aclocal.m4 40 # This package has a completely custom aclocal.m4, which should be acinclude.m4.
40 # so we need to back it up and make it usable... 41 if [ ! -e ${S}/acinclude.m4 ]; then
41 if [ ! -e m4/ossp.m4 ]; then 42 mv ${S}/aclocal.m4 ${S}/acinclude.m4
42 mkdir m4
43 mv aclocal.m4 m4/ossp.m4
44 fi 43 fi
45 44
46 rm -f libtool.m4 45 rm -f ${S}/libtool.m4
47} 46}
48 47
49do_install_append() { 48do_install_append() {