mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 12:49:34 +02:00
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]) (From OE-Core rev: f813c09493ddad2df5b18b3b3b5c44d5b4201b72) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d4e1862453
commit
edd91b4b30
@@ -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
|
||||||
|
|
||||||
@@ -5,6 +5,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
|
|||||||
file://add-exclude.patch \
|
file://add-exclude.patch \
|
||||||
file://opkg-configure.service \
|
file://opkg-configure.service \
|
||||||
file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
|
file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
|
||||||
|
file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/${BPN}-${PV}"
|
S = "${WORKDIR}/${BPN}-${PV}"
|
||||||
|
|||||||
Reference in New Issue
Block a user