mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #7863 from heitbaum/gcrypt
libgcrypt: update to 1.10.2
This commit is contained in:
commit
794a8ad627
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libgcrypt"
|
||||
PKG_VERSION="1.8.7"
|
||||
PKG_SHA256="03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748"
|
||||
PKG_VERSION="1.10.2"
|
||||
PKG_SHA256="3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.gnupg.org/"
|
||||
PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
|
@ -1,24 +1,24 @@
|
||||
diff -Naur libgcrypt-1.4.6/cipher/Makefile.am libgcrypt-1.4.6.patch/cipher/Makefile.am
|
||||
--- libgcrypt-1.4.6/cipher/Makefile.am 2009-12-11 16:31:38.000000000 +0100
|
||||
+++ libgcrypt-1.4.6.patch/cipher/Makefile.am 2011-05-08 03:21:56.463021968 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
camellia.c camellia.h camellia-glue.c
|
||||
@@ -153,7 +153,7 @@
|
||||
|
||||
|
||||
if ENABLE_O_FLAG_MUNGING
|
||||
-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
else
|
||||
o_flag_munging = cat
|
||||
endif
|
||||
diff -Naur libgcrypt-1.4.6/cipher/Makefile.in libgcrypt-1.4.6.patch/cipher/Makefile.in
|
||||
--- libgcrypt-1.4.6/cipher/Makefile.in 2010-07-13 17:42:20.000000000 +0200
|
||||
+++ libgcrypt-1.4.6.patch/cipher/Makefile.in 2011-05-08 03:22:12.059208971 +0200
|
||||
@@ -274,7 +274,7 @@
|
||||
camellia.c camellia.h camellia-glue.c
|
||||
@@ -602,7 +602,7 @@
|
||||
blake2b-amd64-avx2.S blake2s-amd64-avx.S
|
||||
|
||||
@ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
|
||||
-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
all: all-am
|
||||
-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
@ENABLE_INSTRUMENTATION_MUNGING_FALSE@instrumentation_munging = cat
|
||||
|
||||
.SUFFIXES:
|
||||
# We need to disable instrumentation for these modules as they use cc as
|
||||
|
@ -1,27 +0,0 @@
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index a7bc0fa..1a5bffc 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -76,13 +76,14 @@ case "${host}" in
|
||||
i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
|
||||
ac_cv_sys_symbol_underscore=yes
|
||||
;;
|
||||
- *)
|
||||
- if test "$cross_compiling" = yes; then
|
||||
- if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
- ac_cv_sys_symbol_underscore=yes
|
||||
- fi
|
||||
- else
|
||||
- tmp_do_check="yes"
|
||||
+ *) if test -z "$ac_cv_sys_symbol_underscore"; then
|
||||
+ if test "$cross_compiling" = yes; then
|
||||
+ if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
+ ac_cv_sys_symbol_underscore=yes
|
||||
+ fi
|
||||
+ else
|
||||
+ tmp_do_check="yes"
|
||||
+ fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
Loading…
x
Reference in New Issue
Block a user