From d772775b3f77a753e8401dba3b4a73d5246a290f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 10 Dec 2021 14:22:42 +0000 Subject: apmd: remove obsolete support for renamed libtool libtool is now longer renamed to ${host}-libtool, so remove the changes to support this. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/apmd/apmd/libtool.patch | 22 +++++++++++++++------- meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch index 834ee080a1..fd0a952890 100644 --- a/meta/recipes-bsp/apmd/apmd/libtool.patch +++ b/meta/recipes-bsp/apmd/apmd/libtool.patch @@ -1,3 +1,8 @@ +From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001 +From: Scott Garman +Date: Tue, 13 Jul 2010 16:46:46 +0800 +Subject: [PATCH] apmd: upgrade to 3.2.2-14 + Add by RP to address "unable to infer tagged configuration" error: commit 35de05e61b88c0808a5e885bb0efdf420555d5ad Author: Richard Purdie @@ -15,15 +20,18 @@ Upstream-Status: Pending Signed-off-by: Scott Garman -Index: apmd-3.2.2.orig/Makefile -=================================================================== ---- apmd-3.2.2.orig.orig/Makefile 2004-01-04 08:13:18.000000000 +0000 -+++ apmd-3.2.2.orig/Makefile 2008-04-21 17:10:03.000000000 +0100 -@@ -58,9 +57,8 @@ - #CFLAGS=-O3 -m486 -fomit-frame-pointer +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 92fc0fd..8e283dc 100644 +--- a/Makefile ++++ b/Makefile +@@ -59,8 +59,8 @@ RANLIB=ranlib #LDFLAGS=-s --LIBTOOL=libtool --quiet + LIBTOOL=libtool --quiet -LT_COMPILE = $(LIBTOOL) --mode=compile $(CC) -LT_LINK = $(LIBTOOL) --mode=link $(CC) +LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb index da17e5a235..1779e8b2a0 100644 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb +++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb @@ -43,7 +43,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile() { # apmd doesn't use whole autotools. Just libtool for installation - oe_runmake "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" apm apmd + oe_runmake apm apmd } do_install() { -- cgit 1.2.3-korg