From 0d13752d7db211fbd70932b617a1ff13b9199b0e Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Mon, 7 Oct 2019 07:04:03 +0200
Subject: core/gnutls: PIC problem is fixed upstream

---
 core/gnutls/PKGBUILD                           |  9 -------
 core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch | 35 --------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 core/gnutls/PKGBUILD
 delete mode 100644 core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch

(limited to 'core')

diff --git a/core/gnutls/PKGBUILD b/core/gnutls/PKGBUILD
deleted file mode 100644
index 560b3924..00000000
--- a/core/gnutls/PKGBUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-# see https://gitlab.com/gnutls/gnutls/issues/818
-
-source+=('gnutls-3.6.9-nonPIC-assembly.patch')
-sha256sums+=('b5dc46a39f6853b0deb5d61da0553d836f672b011d595e2c6558d5d11aa7a927')
-
-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
deleted file mode 100644
index b18f52a5..00000000
--- a/core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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" >> $@
-diff -rauN gnutls-3.6.9/lib/accelerated/x86/elf/aesni-x86.s gnutls-3.6.9-nonPIC-assembly-patch/lib/accelerated/x86/elf/aesni-x86.s
---- gnutls-3.6.9/lib/accelerated/x86/elf/aesni-x86.s	2019-06-28 21:06:07.000000000 +0200
-+++ gnutls-3.6.9-nonPIC-assembly-patch/lib/accelerated/x86/elf/aesni-x86.s	2019-08-18 17:36:49.498546884 +0200
-@@ -2892,7 +2892,7 @@
- .L112pic:
- 	popl	%ebx
- 	leal	.Lkey_const-.L112pic(%ebx),%ebx
--	leal	_gnutls_x86_cpuid_s,%ebp
-+	leal 	_gnutls_x86_cpuid_s-.Lkey_const(%ebx),%ebp
- 	movups	(%eax),%xmm0
- 	xorps	%xmm4,%xmm4
- 	movl	4(%ebp),%ebp
-- 
cgit v1.2.3