Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
From f8c7732e24502c06739944f9a721c9d84a50319d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 26 Aug 2018 19:11:55 +0200
|
||||
Subject: [PATCH] fix install of binaries with a static only library
|
||||
|
||||
Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the
|
||||
following error is raised:
|
||||
|
||||
CMake Error at cmake_install.cmake:73 (file):
|
||||
file RPATH_CHANGE could not write new RPATH:
|
||||
|
||||
/usr/lib
|
||||
|
||||
to the file:
|
||||
|
||||
/home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/rdjpgcom
|
||||
|
||||
No valid ELF RPATH or RUNPATH entry exists in the file;
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/273]
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1719522..862ab11 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -109,7 +109,9 @@ endif()
|
||||
|
||||
include(cmakescripts/GNUInstallDirs.cmake)
|
||||
|
||||
+if(ENABLE_SHARED)
|
||||
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||
+endif()
|
||||
|
||||
macro(report_directory var)
|
||||
if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/libjpeg-turbo/files/1.5.2/
|
||||
sha1 e788f6defa58b4393a5e1685c018f3b962971457 libjpeg-turbo-1.5.2.tar.gz
|
||||
md5 6b4923e297a7eaa255f08511017a8818 libjpeg-turbo-1.5.2.tar.gz
|
||||
# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.0/
|
||||
sha1 fe49aea935617748c21ecbe46c986d6c1b98f39b libjpeg-turbo-2.0.0.tar.gz
|
||||
md5 b12a3fcf1d078db38410f27718a91b83 libjpeg-turbo-2.0.0.tar.gz
|
||||
# Locally computed
|
||||
sha256 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 libjpeg-turbo-1.5.2.tar.gz
|
||||
sha256 5c08657eda60b7946a913ee22ac73603335a468a6aa95204506a1586a8d677ee LICENSE.md
|
||||
sha256 53a3e3c299e08856964f4c5986e242c3695837b73c64625092f70c774e8af5d2 README.ijg
|
||||
sha256 778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868 libjpeg-turbo-2.0.0.tar.gz
|
||||
sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e LICENSE.md
|
||||
sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JPEG_TURBO_VERSION = 1.5.2
|
||||
JPEG_TURBO_VERSION = 2.0.0
|
||||
JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
|
||||
JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
|
||||
JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)
|
||||
@@ -13,14 +13,22 @@ JPEG_TURBO_INSTALL_STAGING = YES
|
||||
JPEG_TURBO_PROVIDES = jpeg
|
||||
JPEG_TURBO_DEPENDENCIES = host-pkgconf
|
||||
|
||||
JPEG_TURBO_CONF_OPTS = --with-jpeg8
|
||||
JPEG_TURBO_CONF_OPTS = -DWITH_JPEG8=ON
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
JPEG_TURBO_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG_SIMD_SUPPORT),y)
|
||||
JPEG_TURBO_CONF_OPTS += --with-simd
|
||||
JPEG_TURBO_CONF_OPTS += -DWITH_SIMD=ON
|
||||
# x86 simd support needs nasm
|
||||
JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm)
|
||||
else
|
||||
JPEG_TURBO_CONF_OPTS += --without-simd
|
||||
JPEG_TURBO_CONF_OPTS += -DWITH_SIMD=OFF
|
||||
endif
|
||||
|
||||
define JPEG_TURBO_REMOVE_USELESS_TOOLS
|
||||
@@ -29,4 +37,4 @@ endef
|
||||
|
||||
JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user