[oe-commits] Paul Barker : opkg: fix header installation for libopkg

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 873689bbabba25e7be5c12317c04519a7bc8d0ef
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=873689bbabba25e7be5c12317c04519a7bc8d0ef

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Mon Jun 17 01:22:02 2013 +0100

opkg: fix header installation for libopkg

When opkg is built outside the source directory, libopkg headers aren't all
installed as the search path for headers only includes the directory that make
is being ran in, not the source directory. So we fix this by adding
$(srcdir)/*.h to the list of header files to install.

Without this patch, "/usr/include/libopkg" will only include the file config.h.
With this patch, other files such as "opkg.h" are present which are needed to
compile software which uses libopkg.

The new patch has also been submitted upstream as a fix to opkg itself.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../0001-Fix-libopkg-header-installation.patch     |   32 ++++++++++++++++++++
 meta/recipes-devtools/opkg/opkg_svn.bb             |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch b/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch
new file mode 100644
index 0000000..c27fdb1
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch
@@ -0,0 +1,32 @@
+From 79a40cc4c3b5d6f8a90d9dc0ac5d2c40983764f7 Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul at paulbarker.me.uk>
+Date: Sun, 16 Jun 2013 23:27:27 +0100
+Subject: [PATCH] Fix libopkg header installation.
+
+When opkg is built outside the source directory, libopkg headers aren't all
+installed as the search path for headers only includes the directory that make
+is being ran in, not the source directory. So we fix this by adding
+$(srcdir)/*.h to the list of header files to install.
+
+Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
+Upstream-status: Submitted
+---
+ libopkg/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
+index 043c5c4..b6f4f7b 100644
+--- a/libopkg/Makefile.am
++++ b/libopkg/Makefile.am
+@@ -2,7 +2,7 @@
+ AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS)
+ 
+ libopkg_includedir=$(includedir)/libopkg
+-libopkg_include_HEADERS= *.h
++libopkg_include_HEADERS= *.h $(srcdir)/*.h
+ 
+ 
+ opkg_libcore_sources = \
+-- 
+1.8.3
+
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 382bfdd..9f3512d 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -2,6 +2,7 @@ require opkg.inc
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
            file://obsolete_automake_macros.patch \
+	   file://0001-Fix-libopkg-header-installation.patch \
 "
 
 S = "${WORKDIR}/trunk"