Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001
|
||||
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
||||
Date: Sat, 14 Jul 2018 11:18:45 +0200
|
||||
Subject: [PATCH] Only fix RPATH if install_rpath is not empty
|
||||
|
||||
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
||||
[Fix: remove leftover from original/unconditional code]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
mesonbuild/minstall.py | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
|
||||
index 8ac6aab1..7ef04116 100644
|
||||
--- a/mesonbuild/minstall.py
|
||||
+++ b/mesonbuild/minstall.py
|
||||
@@ -478,8 +478,14 @@ class Installer:
|
||||
printed_symlink_error = True
|
||||
if os.path.isfile(outname):
|
||||
try:
|
||||
- depfixer.fix_rpath(outname, install_rpath, final_path,
|
||||
- install_name_mappings, verbose=False)
|
||||
+ # Buildroot check-host-rpath script expects RPATH
|
||||
+ # But if install_rpath is empty, it will stripped.
|
||||
+ # So, preserve it in this case
|
||||
+ if install_rpath:
|
||||
+ depfixer.fix_rpath(outname, install_rpath, final_path,
|
||||
+ install_name_mappings, verbose=False)
|
||||
+ else:
|
||||
+ print("Skipping RPATH fixing")
|
||||
except SystemExit as e:
|
||||
if isinstance(e.code, int) and e.code == 0:
|
||||
pass
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -11,6 +11,7 @@ strip = '@TARGET_CROSS@strip'
|
||||
pkgconfig = '@HOST_DIR@/usr/bin/pkg-config'
|
||||
|
||||
[properties]
|
||||
needs_exe_wrapper = true
|
||||
c_args = [@TARGET_CFLAGS@]
|
||||
c_link_args = [@TARGET_LDFLAGS@]
|
||||
cpp_args = [@TARGET_CXXFLAGS@]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://github.com/mesonbuild/meson/releases/download/0.44.0/meson-0.44.0.tar.gz.asc
|
||||
sha256 50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b meson-0.44.0.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
|
||||
# https://github.com/mesonbuild/meson/releases/download/0.49.0/meson-0.49.0.tar.gz.asc
|
||||
sha256 fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551 meson-0.49.0.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MESON_VERSION = 0.44.0
|
||||
MESON_VERSION = 0.49.0
|
||||
MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
|
||||
MESON_LICENSE = Apache-2.0
|
||||
MESON_LICENSE_FILES = COPYING
|
||||
@@ -14,16 +14,47 @@ HOST_MESON_DEPENDENCIES = host-ninja
|
||||
HOST_MESON_NEEDS_HOST_PYTHON = python3
|
||||
|
||||
HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
|
||||
HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
|
||||
HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU)
|
||||
|
||||
# https://mesonbuild.com/Reference-tables.html#cpu-families
|
||||
ifeq ($(BR2_arcle)$(BR2_arceb),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = arc
|
||||
else ifeq ($(BR2_arm)$(BR2_armeb),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = arm
|
||||
else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = aarch64
|
||||
else ifeq ($(BR2_i386),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = x86
|
||||
else ifeq ($(BR2_mips)$(BR2_mipsel),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = mips
|
||||
else ifeq ($(BR2_mips64)$(BR2_mips64el),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = mips64
|
||||
else ifeq ($(BR2_powerpc),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = ppc
|
||||
else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = ppc64
|
||||
else ifeq ($(BR2_riscv),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = riscv64
|
||||
else ifeq ($(BR2_sparc),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = sparc
|
||||
else ifeq ($(BR2_sparc64),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = sparc64
|
||||
else ifeq ($(BR2_x86_64),y)
|
||||
HOST_MESON_TARGET_CPU_FAMILY = x86_64
|
||||
else
|
||||
HOST_MESON_TARGET_CPU_FAMILY = $(ARCH)
|
||||
endif
|
||||
|
||||
HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
|
||||
HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
|
||||
HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
|
||||
|
||||
# Generate a Meson cross-compilation.conf suitable for use with the
|
||||
# SDK
|
||||
define HOST_MESON_INSTALL_CROSS_CONF
|
||||
mkdir -p $(HOST_DIR)/etc/meson
|
||||
sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
|
||||
-e "s%@TARGET_ARCH@%$(ARCH)%g" \
|
||||
-e "s%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
|
||||
-e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
|
||||
-e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
|
||||
-e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \
|
||||
@@ -34,6 +65,6 @@ define HOST_MESON_INSTALL_CROSS_CONF
|
||||
> $(HOST_DIR)/etc/meson/cross-compilation.conf
|
||||
endef
|
||||
|
||||
HOST_MESON_POST_INSTALL_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
|
||||
TARGET_FINALIZE_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
|
||||
|
||||
$(eval $(host-python-package))
|
||||
|
||||
Reference in New Issue
Block a user