jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5518 from Celedhrim/master

Browse Source 
go: update to 1.16.6
This commit is contained in:
CvH 2021-08-08 11:21:37 +02:00 committed by GitHub
commit 082c799bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/addons/addon-depends/containerd/package.mk
View File

@ -23,6 +23,7 @@ pre_make_target() {
export CONTAINERD_REVISION=${PKG_GIT_COMMIT} export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
export CONTAINERD_PKG=github.com/containerd/containerd export CONTAINERD_PKG=github.com/containerd/containerd
export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}" export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
export GO111MODULE=off
mkdir -p ${GOPATH} mkdir -p ${GOPATH}
if [ -d ${PKG_BUILD}/vendor ]; then if [ -d ${PKG_BUILD}/vendor ]; then

4
packages/addons/addon-depends/go/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="go" PKG_NAME="go"
PKG_VERSION="1.14.15" PKG_VERSION="1.16.6"
PKG_SHA256="8167eeb636eeef6010dc004e5ab4a0af77ea3e1c9fe8b3c2fef38c3ddb72bc7d" PKG_SHA256="498cd89c5c965ea2f2e23eef589e0a2dcb4b94f31c3f7dac575d4c35ae89caf7"
PKG_LICENSE="BSD" PKG_LICENSE="BSD"
PKG_SITE="https://golang.org" PKG_SITE="https://golang.org"
PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

16
packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch
View File

@ -1,10 +1,10 @@
--- a/src/crypto/x509/root_unix.go diff --git a/src/crypto/x509/root_linux.go b/src/crypto/x509/root_linux.go
+++ b/src/crypto/x509/root_unix.go index ad6ce5cae7..763c686fed 100644
@@ -20,6 +20,7 @@ --- a/src/crypto/x509/root_linux.go
+++ b/src/crypto/x509/root_linux.go
@@ -20,4 +20,5 @@ var certDirectories = []string{
"/etc/ssl/certs", // SLES10/SLES11, https://golang.org/issue/12139
"/etc/pki/tls/certs", // Fedora/RHEL "/etc/pki/tls/certs", // Fedora/RHEL
"/etc/openssl/certs", // NetBSD "/system/etc/security/cacerts", // Android
"/var/ssl/certs", // AIX + "/etc/ssl", // LibreELEC
+ "/etc/ssl", // LibreELEC
} }
const (

1
packages/addons/addon-depends/libnetwork/package.mk
View File

@ -17,6 +17,7 @@ pre_make_target() {
export CGO_ENABLED=0 export CGO_ENABLED=0
export LDFLAGS="-extld ${CC}" export LDFLAGS="-extld ${CC}"
export GO111MODULE=off
mkdir -p ${GOPATH} mkdir -p ${GOPATH}
if [ -d ${PKG_BUILD}/vendor ]; then if [ -d ${PKG_BUILD}/vendor ]; then

1
packages/addons/service/docker/package.mk
View File

@ -36,6 +36,7 @@ configure_target() {
PKG_GOPATH_ENGINE=${GOPATH} PKG_GOPATH_ENGINE=${GOPATH}
PKG_GOPATH_CLI=${GOPATH}_cli PKG_GOPATH_CLI=${GOPATH}_cli
export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE} export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE}
export GO111MODULE=off
export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}" export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}"