Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From af3098e05535ddb93bb065770d87738e46089efc Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 20 Aug 2017 15:06:01 +0200
|
||||
Subject: [PATCH] Makefile.am: do not overwrite LIBS
|
||||
|
||||
LIBS is meant to be passed on the command line with additional
|
||||
libraries, it should not be overwritten by Makefile.am.
|
||||
|
||||
Instead:
|
||||
|
||||
- Use LDADD to link with external libraries
|
||||
|
||||
- Use <target>_LDFLAGS for additional, non-libraries, linker flags
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Upstream: https://github.com/dashesy/cc-tool/commit/553f9c601646af0c6e3f6150d0fa3bc63ff56416
|
||||
---
|
||||
Makefile.am | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index e79e47b..ed83d91 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -10,14 +10,12 @@ AM_LDFLAGS = \
|
||||
|
||||
# $(BOOST_THREADS_LDFLAGS)
|
||||
|
||||
-LDADD = $(LIBUSB_LIBS)
|
||||
-
|
||||
-LIBS = -s \
|
||||
+LDADD = $(LIBUSB_LIBS) \
|
||||
$(BOOST_FILESYSTEM_LIBS) \
|
||||
$(BOOST_REGEX_LIBS) \
|
||||
$(BOOST_SYSTEM_LIBS) \
|
||||
$(BOOST_PROGRAM_OPTIONS_LIBS)
|
||||
-
|
||||
+
|
||||
# $(BOOST_THREADS_LIBS)
|
||||
|
||||
bin_PROGRAMS=cc-tool
|
||||
@@ -30,4 +28,4 @@ cc_tool_SOURCES=src/main.cpp src/application/cc_flasher.cpp src/application/cc_b
|
||||
src/programmer/cc_253x_254x.cpp src/programmer/cc_251x_111x.cpp \
|
||||
src/programmer/cc_243x.cpp src/programmer/cc_programmer.cpp \
|
||||
src/programmer/cc_unit_driver.cpp src/programmer/cc_unit_info.cpp
|
||||
-
|
||||
+cc_tool_LDFLAGS=-s
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 5e74a15ce1e093b4d8e83cdade60a43b09d698de Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 20 Aug 2017 15:25:06 +0200
|
||||
Subject: [PATCH] m4/boost.m4: fix rpath option check for static linking
|
||||
|
||||
When statically linking, the order in which -l options are passed is
|
||||
important. The contents of the LIBS option passed to the configure
|
||||
environment should be passed *after* other -l options used internally
|
||||
by the package.
|
||||
|
||||
For example, libboost_program_options may used symbols from the
|
||||
libatomic library, and in this case, one need to pass LIBS="-latomic"
|
||||
to cc-tool's configure script. When using dynamic linking, this works
|
||||
fine, because the rpath test does "-latomic
|
||||
-lboost_program_options". However, when statically linking, this
|
||||
doesn't work because libboost_program_options uses symbols from
|
||||
libatomic, so -latomic must be passed *after* -lboost_program_options.
|
||||
|
||||
Therefore, this commit inverts the list of variables used to construct
|
||||
LIBS before doing the _BOOST_AC_LINK_IFELSE() test detecting the rpath
|
||||
option to be used. Indeed, $boost_save_LIBS contains the previously
|
||||
saved LIBS variable, and should be passed after $Boost_lib_LIBS.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
m4/boost.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/boost.m4 b/m4/boost.m4
|
||||
index be470a7..f1825ba 100644
|
||||
--- a/m4/boost.m4
|
||||
+++ b/m4/boost.m4
|
||||
@@ -479,7 +479,7 @@ dnl generated only once above (before we start the for loops).
|
||||
*)
|
||||
for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
|
||||
LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
|
||||
- LIBS="$boost_save_LIBS $Boost_lib_LIBS"
|
||||
+ LIBS="$Boost_lib_LIBS $boost_save_LIBS"
|
||||
_BOOST_AC_LINK_IFELSE([],
|
||||
[boost_rpath_link_ldflag_found=yes
|
||||
break],
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
CC_TOOL_VERSION = 0.26
|
||||
CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool
|
||||
CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz
|
||||
CC_TOOL_LICENSE = GPLv2
|
||||
CC_TOOL_LICENSE = GPL-2.0
|
||||
CC_TOOL_LICENSE_FILES = COPYING
|
||||
CC_TOOL_DEPENDENCIES = boost libusb
|
||||
|
||||
@@ -16,11 +16,16 @@ CC_TOOL_AUTORECONF = YES
|
||||
|
||||
# Configure script "discovers" boost in /usr/local if not given explicitly
|
||||
CC_TOOL_CONF_OPTS = --with-boost=$(STAGING_DIR)/usr
|
||||
CC_TOOL_CONF_ENV = LIBS="$(CC_TOOL_LIBS)"
|
||||
|
||||
# Help boost.m4 find the Boost Regex library, which needs the pthread
|
||||
# library, but isn't detected using a modern (pkg-config) mechanism.
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
CC_TOOL_CONF_ENV += LIBS="-lpthread"
|
||||
CC_TOOL_LIBS += -lpthread
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CC_TOOL_LIBS += -latomic
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user