summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch32
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb3
2 files changed, 1 insertions, 34 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
deleted file mode 100644
index 784c4128c5..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0001-Fix-libopkg-header-installation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 79a40cc4c3b5d6f8a90d9dc0ac5d2c40983764f7 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Sun, 16 Jun 2013 23:27:27 +0100
4Subject: [PATCH] Fix libopkg header installation.
5
6When opkg is built outside the source directory, libopkg headers aren't all
7installed as the search path for headers only includes the directory that make
8is being ran in, not the source directory. So we fix this by adding
9$(srcdir)/*.h to the list of header files to install.
10
11Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
12Upstream-Status: Submitted
13---
14 libopkg/Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
18index 043c5c4..b6f4f7b 100644
19--- a/libopkg/Makefile.am
20+++ b/libopkg/Makefile.am
21@@ -2,7 +2,7 @@
22 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)
23
24 libopkg_includedir=$(includedir)/libopkg
25-libopkg_include_HEADERS= *.h
26+libopkg_include_HEADERS= *.h $(srcdir)/*.h
27
28
29 opkg_libcore_sources = \
30--
311.8.3
32
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 9f3512d06d..3a47b9502d 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -2,12 +2,11 @@ require opkg.inc
2 2
3SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \ 3SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
4 file://obsolete_automake_macros.patch \ 4 file://obsolete_automake_macros.patch \
5 file://0001-Fix-libopkg-header-installation.patch \
6" 5"
7 6
8S = "${WORKDIR}/trunk" 7S = "${WORKDIR}/trunk"
9 8
10SRCREV = "649" 9SRCREV = "650"
11PV = "0.1.8+svnr${SRCPV}" 10PV = "0.1.8+svnr${SRCPV}"
12 11
13PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"