core/gnutls: fix for non-PIC generated assembly code

2 files changed, 32 insertions, 0 deletions

diff --git a/core/gnutls/PKGBUILD b/core/gnutls/PKGBUILD
new file mode 100644
index 00000000..379ac6be
--- /dev/null
+++ b/core/gnutls/PKGBUILD
@@ -0,0 +1,9 @@
+# see https://gitlab.com/gnutls/gnutls/issues/818
+
+source+=('gnutls-3.6.9-nonPIC-assembly.patch')
+sha256sums+=('3a31503c695b445f2551313e822d8010a0220ba632df2e68e94c78bb5345c147')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir/gnutls-3.6.9-nonPIC-assembly.patch"
+}
diff --git a/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch b/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
new file mode 100644
index 00000000..e55aeec9
--- /dev/null
+++ b/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
@@ -0,0 +1,23 @@
+diff -rauN gnutls-3.6.9/cfg.mk gnutls-3.6.9-nonPIC-assembly-patch/cfg.mk
+--- gnutls-3.6.9/cfg.mk	2019-06-28 21:06:07.000000000 +0200
++++ gnutls-3.6.9-nonPIC-assembly-patch/cfg.mk	2019-08-18 08:55:44.846119790 +0200
+@@ -143,6 +143,8 @@
+ 	lib/accelerated/x86/XXX/aes-ssse3-x86.s \
+ 	lib/accelerated/x86/XXX/aes-ssse3-x86_64.s
+ 
++PL_NEEDS_FPIC := aesni-x86.s
++
+ ASM_SOURCES_ELF := $(subst XXX,elf,$(ASM_SOURCES_XXX))
+ ASM_SOURCES_COFF := $(subst XXX,coff,$(ASM_SOURCES_XXX))
+ ASM_SOURCES_MACOSX := $(subst XXX,macosx,$(ASM_SOURCES_XXX))
+@@ -193,7 +195,9 @@
+ 
+ # Appro's code
+ lib/accelerated/x86/elf/%.s: devel/perlasm/%.pl .submodule.stamp 
+-	CC=gcc perl $< elf $@.tmp
++	CC=gcc perl $< elf \
++		$(if $(findstring $(@F),$(PL_NEEDS_FPIC)),-fPIC) \
++		$@.tmp
+ 	cat $<.license $@.tmp > $@ && rm -f $@.tmp
+ 	echo "" >> $@
+ 	echo ".section .note.GNU-stack,\"\",%progbits" >> $@