diff options
| author | Oleksandr Natalenko | 2022-05-15 23:18:01 +0200 |
|---|---|---|
| committer | Oleksandr Natalenko | 2022-05-15 23:18:01 +0200 |
| commit | ae506d87becbb3979ceb5aa0bfb279533aa51fd9 (patch) | |
| tree | 1b69ff8eeaa6307f200f7ccbdf001caa69d13e48 | |
| parent | 4b44fab5fd5fafe06370e7160d8472964cc9f52b (diff) | |
| download | aur-ae506d87becbb3979ceb5aa0bfb279533aa51fd9.tar.gz | |
make relro work
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 9 insertions, 4 deletions
@@ -2,7 +2,7 @@ pkgname=7-zip pkgver=21.07 -pkgrel=5 +pkgrel=6 pkgdesc="File archiver with a high compression ratio" url="https://www.7-zip.org" license=('LGPL' 'BSD' 'custom:unRAR') @@ -13,7 +13,7 @@ source=(https://7-zip.org/a/7z2107-src.7z meson.build) sha256sums=('d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c' 'e4d34366e091b8404dd04f02bcad46518d2930ec0b4a420e1316db020234b085' - 'abeeaafafa81f77b7ddec675fe97d2e9dfa4efd6ad0b92323cb7ddfcb5655d70') + '642be36de3c1957d78b9e3ff24e511f8fe63b9b1ab3527efdb2adaacbeba702e') prepare() { patch -Np1 -i 01-gcc-12.patch diff --git a/meson.build b/meson.build index 0849772f9bf2..750e536e75d8 100644 --- a/meson.build +++ b/meson.build @@ -355,7 +355,6 @@ add_project_arguments( '-D_LZMA_DEC_OPT', '-DPROG_VARIANT_Z', '-D_7ZIP_ASM', - '-D_FORTIFY_SOURCE=2', '-Waddress', '-Waddress-of-packed-member', '-Waggressive-loop-optimizations', @@ -393,6 +392,10 @@ add_project_arguments( ], ) +extra_args = [ + '-Wp,-U_FORTIFY_SOURCE', +] + project_target = executable('7zz', [ uasm_files, @@ -401,7 +404,9 @@ project_target = executable('7zz', ], dependencies: project_dependencies, install: true, - link_args : '-Wl,-z,noexecstack', + link_args: '-Wl,-z,noexecstack', + c_args: extra_args, + cpp_args: extra_args, ) install_data( |