summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/opkg')
-rw-r--r--meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch32
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch b/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch
new file mode 100644
index 0000000000..8bde02af0d
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch
@@ -0,0 +1,32 @@
1From d480d837ff57e855d1cf0b63054d6b1ad7aaf2ee Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 6 Jan 2015 17:54:43 -0800
4Subject: [PATCH] Makefile.am: remove ACLOCAL_AMFLAGS = -I shave -I m4
5
6Fixed:
7libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I shave.
8
9They are already included by configure.ac:
10AC_CONFIG_MACRO_DIR([m4])
11AC_CONFIG_MACRO_DIR([shave])
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 Makefile.am | 2 --
18 1 file changed, 2 deletions(-)
19
20diff --git a/Makefile.am b/Makefile.am
21index 8baa62c..6679f77 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -1,5 +1,3 @@
25-ACLOCAL_AMFLAGS = -I shave -I m4
26-
27 SUBDIRS = libbb libopkg src tests utils man
28
29
30--
311.7.9.5
32
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 2cca63c560..0d08bf9e7e 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -5,6 +5,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
5 file://add-exclude.patch \ 5 file://add-exclude.patch \
6 file://opkg-configure.service \ 6 file://opkg-configure.service \
7 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ 7 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
8 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
8" 9"
9 10
10S = "${WORKDIR}/${BPN}-${PV}" 11S = "${WORKDIR}/${BPN}-${PV}"