NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
be9157e1c0
kumquat-buildroot/package/musl/musl.mk

65 lines
2.0 KiB
Makefile
Raw Normal View History

musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
################################################################################
#
# musl
#
################################################################################
musl: security bump to version 1.1.16 Fixes: CVE-2016-8859 - fixes a serious under-allocation bug in regexec due to integer overflow. Drop upstream patch. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-02 17:07:09 +01:00
MUSL_VERSION = 1.1.16
package: remove the trailing slash sign from <PKG>_SITE variable Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk: $(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)) so it is redundant. This patch removes it from $(PKG)_SITE variable for BR consistency. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 10:46:58 +02:00
MUSL_SITE = http://www.musl-libc.org/releases
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
MUSL_LICENSE = MIT
MUSL_LICENSE_FILES = COPYRIGHT
# Before musl is configured, we must have the first stage
# cross-compiler and the kernel headers
MUSL_DEPENDENCIES = host-gcc-initial linux-headers
package/musl-compat-headers: provide compatibility headers not in musl musl provides neither sys/queue.h nor sys/cdefs.h. Those two headers are however quite widely used in a lot of packages (though they should at least not use cdefs.h which is only full of mostly-legacy macros, and which is mostly an internal header of glibc and was never really meant to be exposed to, and used by packages). But we don't live in an ideal world, so a lot of packages break when those two headers are missing. We already took care of sys/queue.h with the netbsd-queue package. But the need for cdefs.h is getting more and more pressing. We rename the netbsd-queue package into musl-compat-headers, and we make it install sys/queue.h (from NetBSD) and sys/cdefs.h (a minimalist one we bundle in Buildroot). We can't use the cdefs.h from NetBSD because it includes machine-dependent headers; instead we bundle a very minimalistic one, that covers only what we need. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Baruch Siach <baruch@tkos.co.il> Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-18 23:50:13 +02:00
# musl does not provide an implementation for sys/queue.h or sys/cdefs.h.
# So, add the musl-compat-headers package that will install those files,
# into the staging directory:
# sys/queue.h: header from NetBSD
# sys/cdefs.h: minimalist header bundled in Buildroot
MUSL_DEPENDENCIES += musl-compat-headers
musl: add a sys/queue.h implementation Musl does not provide a 'sys/queue.h' implementation, and this has been a problem for packages that depend on it. So lets create a package called netbsd-queue that will install a 'sys/queue.h' in the staging directory when enabled, based on the NetBSD implementation. Musl toolchain and external toolchain packages will depend on this package, so that 'sys/queue.h' will be always installed when compiling with a musl based toolchain. Tested on ARM and x86 in the following cases: - Buildroot musl toolchain. - External musl toolchain without 'sys/queue.h'. - External musl toolchain with 'sys/queue.h'. Fixes: http://autobuild.buildroot.net/results/24bad2d06ab40024dacf136bee722072d587f84e And possibly many others. Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-02 01:58:28 +01:00
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
# musl is part of the toolchain so disable the toolchain dependency
MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO
MUSL_INSTALL_STAGING = YES
musl: build broken on Thumb, use ARM mode Building the musl C library on Thumb (Thumb1, not Thumb2), fails with: {standard input}:20: Error: only lo regs allowed with immediate -- `mov fp,#0' {standard input}:21: Error: only lo regs allowed with immediate -- `mov lr,#0' {standard input}:25: Error: unshifted register required -- `and ip,a1,#-16' Since there are no cores that we support that are Thumb1 only, use the same solution as the one used by glibc: build the C library in ARM mode. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-03-31 21:00:08 +02:00
# Thumb build is broken, build in ARM mode, since all architectures
# that support Thumb1 also support ARM.
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
MUSL_EXTRA_CFLAGS += -marm
endif
musl: two-stage gcc simplifications After switching to a two stage gcc solution, there is no longer a need to do weird things in the musl build, with certain things being done twice (MUSL_CONFIGURE_CALL). Now the MUSL_CONFIGURE_CMDS variable only does the configuration, and the MUSL_BUILD_CMDS only does the build, as it should be. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-14 11:50:01 +02:00
define MUSL_CONFIGURE_CMDS
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
(cd $(@D); \
$(TARGET_CONFIGURE_OPTS) \
musl: work around gcc 4.9.x bug MUSL doesn't build happily with gcc 4.9.0/1 so work around the bug when appropiate as suggested by upstream. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-17 14:43:57 +02:00
CFLAGS="$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) $(MUSL_EXTRA_CFLAGS)" \
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
CPPFLAGS="$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--prefix=/usr \
package/musl: fix C library installation directory Set the installation path for the libraries to /lib instead of /usr/lib. This fixes an issue when building a toolchain with the musl library by the internal toolchain backend of Buildroot in the first step and import this toolchain later as a custom external toolchain in a second step. For this use case check-musl in toolchain/helpers.mk failed because it did not find the libc or libm in sysroot/lib. This patch superseeds: [PATCH 1/1] toolchain/helpers.mk: fix check-musl http://patchwork.ozlabs.org/patch/417587/ Signed-off-by: Jörg Krause <jkrause@posteo.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-12-09 02:44:35 +01:00
--libdir=/lib \
musl: honor static vs. shared library options [Thomas: use SHARED_STATIC_LIBS_OPTS to simplify the logic.] Signed-off-by: Charles Duffy <chaduffy@cisco.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-14 06:29:37 +02:00
--disable-gcc-wrapper \
musl: Make only shared libraries conditional External toolchain use requires a static libc (as buildroot uses `gcc --print-file-name libc.a` to find the sysroot); thus, the static portion of a musl build should not be conditional. Signed-off-by: Charles Duffy <chaduffy@cisco.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-15 17:27:18 +02:00
--enable-static \
$(if $(BR2_STATIC_LIBS),--disable-shared,--enable-shared))
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
endef
define MUSL_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define MUSL_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
musl: two-stage gcc simplifications After switching to a two stage gcc solution, there is no longer a need to do weird things in the musl build, with certain things being done twice (MUSL_CONFIGURE_CALL). Now the MUSL_CONFIGURE_CMDS variable only does the configuration, and the MUSL_BUILD_CMDS only does the build, as it should be. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-14 11:50:01 +02:00
DESTDIR=$(STAGING_DIR) install-libs install-tools install-headers
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
endef
define MUSL_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
package/musl: remove obsolete setting of prefix Using the config option '--libdir=/lib' makes the setting of prefix to an empty path obsolete in MUSL_INSTALL_TARGET_CMDS. Signed-off-by: Jörg Krause <jkrause@posteo.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-12-09 02:44:36 +01:00
DESTDIR=$(TARGET_DIR) install-libs
musl: new package Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 23:17:01 +02:00
$(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o Scrt1.o)
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink