commit e1c004dcaaf8927abce8a6f86e09e88dce158b21
parent 6695e1be7e4a2ed4e3db32bbbecf9dfaee9c3cff
Author: Michael Heimpold <mhei@heimpold.de>
Date: Sat, 3 Sep 2016 22:28:55 +0200
libcanfestival: fix build on LEDE buildbots using ccache
The previous attempt to fix the build error was not successfull
and introduced needlessly a new patch. However, the configure
already provide the required functionality, use it instead.
This should now really solve the build.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat:
2 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libcanfestival
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_PROTO:=hg
PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3
@@ -44,6 +44,7 @@ CONFIGURE_ARGS := \
--cxx=$(TARGET_CXX) \
--ld=$(TARGET_CC) \
--arch=$(ARCH) \
+ --binutils=$(TARGET_CROSS) \
--os=Linux \
--kerneldir=$(LINUX_DIR) \
--prefix=/usr \
diff --git a/libs/libcanfestival/patches/003-makefile-ar-ranlib.patch b/libs/libcanfestival/patches/003-makefile-ar-ranlib.patch
@@ -1,31 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -38,6 +38,9 @@ TARGET = SUB_TARGET
- CAN_DRIVER = SUB_CAN_DRIVER
- TIMERS_DRIVER = SUB_TIMERS_DRIVER
- ENABLE_LSS = SUB_ENABLE_LSS
-+AR ?= $(BINUTILS_PREFIX)ar
-+RANLIB ?= $(BINUTILS_PREFIX)ranlib
-+LD ?= $(BINUTILS_PREFIX)ld
-
- INCLUDES = -I../include -I../include/$(TARGET) -I../include/$(TIMERS_DRIVER) -I../drivers/$(TARGET)
-
-@@ -114,15 +117,15 @@ libcanfestival.a: $(OBJS)
- @echo "*********************************************"
- @echo "**Building [libcanfestival.a]"
- @echo "*********************************************"
-- $(BINUTILS_PREFIX)ar rc $@ $(OBJS)
-- $(BINUTILS_PREFIX)ranlib $@
-+ $(AR) rc $@ $(OBJS)
-+ $(RANLIB) $@
-
- libcanfestival.o: $(OBJS)
- @echo " "
- @echo "*********************************************"
- @echo "**Prelink [libcanfestival.o]"
- @echo "*********************************************"
-- $(BINUTILS_PREFIX)ld -r $(OBJS) -o $@
-+ $(LD) -r $(OBJS) -o $@
-
- $(TARGET)_%.o: %.c
- @echo " "
