diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2019-08-18 09:42:11 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2019-08-18 09:42:11 +0200 |
| commit | 8290023372694cd94a5d717fd21d90d124b16dc5 (patch) | |
| tree | b36a19cca2e3219f8df936f4384c0942f34906a8 | |
| parent | bea9bdb08321e8f1283448854a595d0bbe8da426 (diff) | |
| download | packages-8290023372694cd94a5d717fd21d90d124b16dc5.tar.xz | |
core/gnutls: fix for non-PIC generated assembly code
| -rw-r--r-- | core/gnutls/PKGBUILD | 9 | ||||
| -rw-r--r-- | core/gnutls/gnutls-3.6.9-nonPIC-assembly.patch | 23 |
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" >> $@ |