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>
This commit is contained in:
parent
4fd512fce2
commit
3f1407457f
|
@ -0,0 +1,19 @@
|
||||||
|
uuid.pc is generated at build time so should be installed from the current
|
||||||
|
directory, and not $S.
|
||||||
|
|
||||||
|
Upstream-Status: Pending [should be submitted]
|
||||||
|
Signed-Off-By: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
Index: uuid-1.6.2/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- uuid-1.6.2.orig/Makefile.in 2012-11-13 16:58:28.624156000 +0000
|
||||||
|
+++ uuid-1.6.2/Makefile.in 2012-11-13 17:05:24.224158670 +0000
|
||||||
|
@@ -232,7 +232,7 @@
|
||||||
|
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
|
||||||
|
$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
|
||||||
|
$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
|
||||||
|
- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
|
||||||
|
+ $(SHTOOL) install -c -m 644 uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
|
||||||
|
$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
|
||||||
|
-@if [ ".$(WITH_DCE)" = .yes ]; then \
|
||||||
|
echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
|
|
@ -15,7 +15,7 @@ LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \
|
LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \
|
||||||
file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd"
|
file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
|
SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
|
||||||
file://0001-Change-library-name.patch \
|
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 \
|
||||||
file://0004-fix-data-uuid-from-string.patch \
|
file://0004-fix-data-uuid-from-string.patch \
|
||||||
file://uuid-libtool.patch \
|
file://uuid-libtool.patch \
|
||||||
file://uuid-nostrip.patch \
|
file://uuid-nostrip.patch \
|
||||||
|
file://install-pc.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
|
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
|
||||||
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
|
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
|
||||||
|
@ -36,14 +37,12 @@ EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat
|
||||||
EXTRA_OECONF = "--includedir=${includedir}/ossp"
|
EXTRA_OECONF = "--includedir=${includedir}/ossp"
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
# This package has a completely custom aclocal.m4
|
# This package has a completely custom aclocal.m4, which should be acinclude.m4.
|
||||||
# so we need to back it up and make it usable...
|
if [ ! -e ${S}/acinclude.m4 ]; then
|
||||||
if [ ! -e m4/ossp.m4 ]; then
|
mv ${S}/aclocal.m4 ${S}/acinclude.m4
|
||||||
mkdir m4
|
|
||||||
mv aclocal.m4 m4/ossp.m4
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f libtool.m4
|
rm -f ${S}/libtool.m4
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
|
|
Loading…
Reference in New Issue