diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-06 18:00:52 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:35:24 +0000 |
| commit | f813c09493ddad2df5b18b3b3b5c44d5b4201b72 (patch) | |
| tree | 687a10fd9924fd565556c28f5a1589d66b2d6f97 | |
| parent | 871dc461b1dfc431c0c95743af1624b781262bce (diff) | |
| download | openembedded-core-contrib-f813c09493ddad2df5b18b3b3b5c44d5b4201b72.tar.gz | |
opkg: fix libtoolize error
Fixed:
libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I shave.
They are already included by configure.ac:
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([shave])
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.2.4.bb | 1 |
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 00000000000..8bde02af0d8 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch @@ -0,0 +1,32 @@ +From d480d837ff57e855d1cf0b63054d6b1ad7aaf2ee Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 6 Jan 2015 17:54:43 -0800 +Subject: [PATCH] Makefile.am: remove ACLOCAL_AMFLAGS = -I shave -I m4 + +Fixed: +libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I shave. + +They are already included by configure.ac: +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([shave]) + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 8baa62c..6679f77 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,3 @@ +-ACLOCAL_AMFLAGS = -I shave -I m4 +- + SUBDIRS = libbb libopkg src tests utils man + + +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb index 2cca63c5607..0d08bf9e7ed 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 file://add-exclude.patch \ file://opkg-configure.service \ file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ + file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ " S = "${WORKDIR}/${BPN}-${PV}" |