Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -10,7 +10,7 @@ linking for libuuid only. Otherwise the build will fail like this:
|
||||
ld: attempted static link of dynamic object `/usr/lib/libuuid.so'
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
[Sent upstream: http://oss.sgi.com/pipermail/xfs/2015-November/045136.html]
|
||||
[Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html]
|
||||
---
|
||||
mdrestore/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Tue, 15 Dec 2015 20:51:35 -0300
|
||||
Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC
|
||||
|
||||
When cross-compiling CFLAGS might not be suitable for the host
|
||||
(BUILD_CC) compiler since it might contain arch-specific options.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
libxfs/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libxfs/Makefile b/libxfs/Makefile
|
||||
index e021625..ad76a04 100644
|
||||
--- a/libxfs/Makefile
|
||||
+++ b/libxfs/Makefile
|
||||
@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY)
|
||||
|
||||
crc32table.h: gen_crc32table.c
|
||||
@echo " [CC] gen_crc32table"
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
|
||||
+ $(Q) $(BUILD_CC) -o gen_crc32table $<
|
||||
@echo " [GENERATE] $@"
|
||||
$(Q) ./gen_crc32table > crc32table.h
|
||||
|
||||
@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c
|
||||
# disk.
|
||||
crc32selftest: gen_crc32table.c crc32table.h crc32.c
|
||||
@echo " [TEST] CRC32"
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
+ $(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
$(Q) ./$@
|
||||
|
||||
# set up include/xfs header directory
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 26 Feb 2017 12:04:54 +0100
|
||||
Subject: [PATCH] build: add EXTRALIBS to link with
|
||||
|
||||
When doing a uClibc static build, the build fails to link:
|
||||
http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log
|
||||
|
||||
The cause is due to:
|
||||
- xfsprogs links dome programs with util-linux' libblkid
|
||||
- util-linux' libblkid is linked to util-linux' libuuid
|
||||
- util-linux' libuuid uses i18n functions when locales are enabled
|
||||
- uClibc does not provide i18n functions
|
||||
- i18n functions are provided by libintl from libintl from gettext
|
||||
|
||||
util-linux installs pkg-config files for thos two libs. However,
|
||||
xfsprogs does not use pkg-config to find libblkid or libuuid, thus it
|
||||
misses the Libs.private field from libuid.
|
||||
|
||||
In this case, it is necessary to pass LIBS=-lintl at configure time, so
|
||||
that configure correctly finds libblkid.
|
||||
|
||||
Still, this is not enough, because the build will not use LIBS during
|
||||
the link phase.
|
||||
|
||||
We fix that last bit by adding EXTRALIBS to the libraries to link with,
|
||||
so that it is possible to pass EXTRALIBS=-lintl at build time:
|
||||
|
||||
$ ./configure [...] LIBS=-lintl
|
||||
$ make EXTRALIBS=-lintl
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Cc: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
include/buildmacros | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/buildmacros b/include/buildmacros
|
||||
index a7c5d8a..dd62d80 100644
|
||||
--- a/include/buildmacros
|
||||
+++ b/include/buildmacros
|
||||
@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
|
||||
|
||||
LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
|
||||
LTLDFLAGS += $(LOADERFLAGS)
|
||||
-LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
|
||||
+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS)
|
||||
|
||||
MAKEOPTS = --no-print-directory Q=$(Q)
|
||||
SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
comment "xfsprogs needs a glibc or uClibc toolchain w/ threads"
|
||||
comment "xfsprogs needs a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_XFSPROGS
|
||||
bool "xfsprogs"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated after checking pgp signature:
|
||||
# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign
|
||||
sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc
|
||||
sha256 b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec xfsprogs-4.14.0.tar.xz
|
||||
sha256 ee304b1b1da08b261f1d1f31d229fc70d2d0c552c7429e9e84c0fac878d94209 doc/COPYING
|
||||
|
||||
@@ -4,9 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XFSPROGS_VERSION = 4.8.0
|
||||
XFSPROGS_VERSION = 4.14.0
|
||||
XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
|
||||
XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
|
||||
XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)
|
||||
XFSPROGS_LICENSE_FILES = doc/COPYING
|
||||
|
||||
XFSPROGS_DEPENDENCIES = util-linux
|
||||
|
||||
@@ -18,23 +20,6 @@ XFSPROGS_CONF_OPTS = \
|
||||
INSTALL_GROUP=root \
|
||||
--enable-static
|
||||
|
||||
# xfsprogs links some of its programs to libs from util-linux, which use
|
||||
# i18n functions. For shared-only builds, that's automatically pulled in.
|
||||
# Static builds need some help, though...
|
||||
#
|
||||
# No need to depend on gettext in this case: xfsprogs does not use it for
|
||||
# itself; util-linux does need it and has it in its own dependencies.
|
||||
#
|
||||
# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they
|
||||
# do not use the LIBS variable set by configure. So we use EXTRALIBS that
|
||||
# is added by our patch.
|
||||
#
|
||||
# It is not needed to propagate the EXTRALIBS to the install step.
|
||||
ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy)
|
||||
XFSPROGS_CONF_OPTS += LIBS=-lintl
|
||||
XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl
|
||||
endif
|
||||
|
||||
XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user