Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,80 @@
|
||||
From 9a6d50b3f355c1e4d72a235aa0bac4856dff1785 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Tue, 27 Mar 2018 19:59:23 +0100
|
||||
Subject: [PATCH] CMake: Handle multiple libraries being returned for Brotli
|
||||
|
||||
Brotli is built as three libraries: libbrotlienc, libbrotlidec, and
|
||||
libbrotlicommon. When requesting the linker flags using pkg-config for
|
||||
e.g. libbrotlidec, it will return both libbrotlidec and libbrotlicommon.
|
||||
The FindBrotli*.cmake files ignore the names of the libraries returned
|
||||
by pkg-config, and hardcode only the libbrotli{enc,dec} names. While
|
||||
this is fine when using shared libraries (they contain an entry for
|
||||
libbrotlicommon as required library in their headers), it will cause
|
||||
linker errors when Brotli has been built as static libraries, due to
|
||||
the missing symbols from libbrotlicommon being unknown to the linker.
|
||||
|
||||
This fixes FindBrotli*.cmake files by using the library names reported
|
||||
by pkg-config (instead of hardcoding them), and applying find_library()
|
||||
to each of the libraries to find their absolute paths. If any of the
|
||||
libraries is missing, the corresponding BROTLI{ENC,DEC}_LIBRARIES is
|
||||
unset to let find_package_handle_standard_args() report an error.
|
||||
---
|
||||
cmake/FindBrotliDec.cmake | 13 +++++++++----
|
||||
cmake/FindBrotliEnc.cmake | 14 ++++++++++----
|
||||
2 files changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Upstream-Status: Submitted [https://github.com/google/woff2/pull/112]
|
||||
|
||||
diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
|
||||
index abb06f4..9cbb415 100644
|
||||
--- a/cmake/FindBrotliDec.cmake
|
||||
+++ b/cmake/FindBrotliDec.cmake
|
||||
@@ -18,10 +18,15 @@ find_path(BROTLIDEC_INCLUDE_DIRS
|
||||
HINTS ${PC_BROTLIDEC_INCLUDEDIR}
|
||||
)
|
||||
|
||||
-find_library(BROTLIDEC_LIBRARIES
|
||||
- NAMES brotlidec
|
||||
- HINTS ${PC_BROTLIDEC_LIBDIR}
|
||||
-)
|
||||
+set(BROTLIDEC_LIBRARIES "")
|
||||
+foreach(_lib ${PC_BROTLIDEC_LIBRARIES})
|
||||
+ find_library(PC_BROTLIDEC_PATH_${_lib} ${_lib} HINTS ${PC_BROTLIDEC_LIBRARY_DIRS})
|
||||
+ if(NOT PC_BROTLIDEC_PATH_${_lib})
|
||||
+ unset(BROTLIDEC_LIBRARIES)
|
||||
+ break()
|
||||
+ endif()
|
||||
+ list(APPEND BROTLIDEC_LIBRARIES "${PC_BROTLIDEC_PATH_${_lib}}")
|
||||
+endforeach()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(BrotliDec
|
||||
diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
|
||||
index 4be347d..55f3932 100644
|
||||
--- a/cmake/FindBrotliEnc.cmake
|
||||
+++ b/cmake/FindBrotliEnc.cmake
|
||||
@@ -18,10 +18,16 @@ find_path(BROTLIENC_INCLUDE_DIRS
|
||||
HINTS ${PC_BROTLIENC_INCLUDEDIR}
|
||||
)
|
||||
|
||||
-find_library(BROTLIENC_LIBRARIES
|
||||
- NAMES brotlienc
|
||||
- HINTS ${PC_BROTLIENC_LIBDIR}
|
||||
-)
|
||||
+set(BROTLIENC_LIBRARIES "")
|
||||
+foreach(_lib ${PC_BROTLIENC_LIBRARIES})
|
||||
+ find_library(PC_BROTLIENC_PATH_${_lib} ${_lib}
|
||||
+ HINTS ${PC_BROTLIENC_LIBRARY_DIRS})
|
||||
+ if(NOT PC_BROTLIENC_PATH_${_lib})
|
||||
+ unset(BROTLIENC_LIBRARIES)
|
||||
+ break()
|
||||
+ endif()
|
||||
+ list(APPEND BROTLIENC_LIBRARIES "${PC_BROTLIENC_PATH_${_lib}}")
|
||||
+endforeach()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(BrotliEnc
|
||||
--
|
||||
2.16.3
|
||||
|
||||
9
bsp/buildroot/package/woff2/Config.in
Normal file
9
bsp/buildroot/package/woff2/Config.in
Normal file
@@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_WOFF2
|
||||
bool "woff2"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_BROTLI
|
||||
help
|
||||
Reference implementation for the WOFF2 font file format,
|
||||
typically used for Web fonts
|
||||
|
||||
https://github.com/google/woff2
|
||||
5
bsp/buildroot/package/woff2/woff2.hash
Normal file
5
bsp/buildroot/package/woff2/woff2.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# Locally generated:
|
||||
sha512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d v1.0.2.tar.gz
|
||||
|
||||
# Hash for license files:
|
||||
sha512 8ee924da3fb5d16135adcf6a8fbe9e2e8f3d2d80468617e72ca4fa059a60f8455c9a5f68a8dc381b1297c8bf39c887a912d0f69246d2604ada74d3da9e8e490b LICENSE
|
||||
30
bsp/buildroot/package/woff2/woff2.mk
Normal file
30
bsp/buildroot/package/woff2/woff2.mk
Normal file
@@ -0,0 +1,30 @@
|
||||
################################################################################
|
||||
#
|
||||
# woff2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WOFF2_VERSION = 1.0.2
|
||||
WOFF2_SOURCE = v$(WOFF2_VERSION).tar.gz
|
||||
WOFF2_SITE = https://github.com/google/woff2/archive
|
||||
WOFF2_LICENSE = MIT
|
||||
WOFF2_LICENSE_FILES = LICENSE
|
||||
WOFF2_INSTALL_STAGING = YES
|
||||
WOFF2_DEPENDENCIES = brotli
|
||||
WOFF2_CONF_OPTS = \
|
||||
-DNOISY_LOGGING=OFF
|
||||
|
||||
# The CMake build files for woff2 manually set some RPATH handling options
|
||||
# which make the installation steps fail with static builds, so pass this
|
||||
# to prevent any attempt of mangling RPATH that CMake would do.
|
||||
ifneq ($(BR2_SHARED_LIBS),y)
|
||||
WOFF2_CONF_OPTS += -DCMAKE_SKIP_RPATH=ON
|
||||
endif
|
||||
|
||||
# Internal error, aborting at dw2gencfi.c:215 in emit_expr_encoded
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
|
||||
ifeq ($(BR2_m68k_cf),y)
|
||||
WOFF2_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user