d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2020.02.7 (#923)

Browse Source 
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
2020-10-22 17:05:36 +02:00
committed by Stefan Agner
parent f9c29ef209
commit e43d4cd632
332 changed files with 10767 additions and 1806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
buildroot/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch Normal file
View File

@@ -0,0 +1,67 @@
From 3edb88b55c0870989778c670d555aa159a2c3abc Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 31 Aug 2020 20:56:43 +0200
Subject: [PATCH] don't install a libtool file with static library
Static library is supported since version 1.3.11 and
https://github.com/silnrsi/graphite/commit/2f143c04da5caa43ddf4dba437b2f2bc26bf4238
However, graphite2 is still installing libgraphite2.la which contains
incorrect information (i.e. dlname set to libgraphite2.so and
old_library set to ''):
dlname='libgraphite2.so'
library_names='libgraphite2.so.3.2.1 libgraphite2.so.3 libgraphite2.so'
old_library=''
dependency_libs=''
This will result in the following build failure with any applications
using this file such as harfbuzz:
arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory
make[5]: *** [main] Error 1
Instead of trying to fix this libtool file, just disable it when
building a static library as it is not needed
Fixes:
- http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/silnrsi/graphite/pull/65]
---
src/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6ac26bf..a7ace040 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,7 +131,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
endif ()
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ if (BUILD_SHARED_LIBS)
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@@ -146,7 +148,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ if (BUILD_SHARED_LIBS)
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
--
2.28.0

7
buildroot/package/graphite2/Config.in
View File

@@ -1,13 +1,12 @@
config BR2_PACKAGE_GRAPHITE2
bool "graphite2"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
help
Graphite is a project within SIL's scripts and software dev
groups to provide cross-platform rendering for complex
writing systems.
http://graphite.sil.org/
https://github.com/silnrsi/graphite
comment "graphite2 needs a toolchain w/ C++, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
comment "graphite2 needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP

6
buildroot/package/graphite2/graphite2.hash
View File

@@ -1,6 +1,4 @@
# From http://sourceforge.net/projects/silgraphite/files/graphite2
md5 b39d5ed21195f8b709bcee548c87e2b5 graphite2-1.3.10.tgz
sha1 668f3bce96fc02d90ea875b401ed36b2e8957d2f graphite2-1.3.10.tgz
# From https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum
sha256 f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d graphite2-1.3.14.tgz
# Locally computed
sha256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae graphite2-1.3.10.tgz
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE

5
buildroot/package/graphite2/graphite2.mk
View File

@@ -4,9 +4,10 @@
#
################################################################################
GRAPHITE2_VERSION = 1.3.10
GRAPHITE2_VERSION = 1.3.14
GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz
GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2
GRAPHITE2_SITE = \
https://github.com/silnrsi/graphite/releases/download/$(GRAPHITE2_VERSION)
GRAPHITE2_INSTALL_STAGING = YES
GRAPHITE2_LICENSE = LGPL-2.1+
GRAPHITE2_LICENSE_FILES = LICENSE