diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2022-04-23 00:25:45 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-04-28 08:44:53 -0400 |
commit | a36ad55338890560d55d628ecf055f7061d16cf4 (patch) | |
tree | 9e2a836443db116f64451f16b2370264d14103e6 /libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch | |
parent | eb2a14416eca0aa2b5d7f70c3b85274419374fba (diff) | |
download | abslibre-a36ad55338890560d55d628ecf055f7061d16cf4.tar.gz abslibre-a36ad55338890560d55d628ecf055f7061d16cf4.tar.bz2 abslibre-a36ad55338890560d55d628ecf055f7061d16cf4.zip |
[pacman]: upgrade to v6.0.1
also:
* added keyring update openrc service file
* add dummy.conf
empty.conf and the remaining changes were mainly to minimize the diff against arch
Diffstat (limited to 'libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch')
-rw-r--r-- | libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch b/libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch new file mode 100644 index 000000000..ca667d88f --- /dev/null +++ b/libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch @@ -0,0 +1,40 @@ +From e37f7d8b6b4d2f9accf97eb96d0eacbddf2a1345 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +Date: Sat, 1 Jan 2022 14:40:24 +0100 +Subject: [PATCH] makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map + +>From gcc(1): + +-ffile-prefix-map=old=new + [...] Specifying this option is equivalent to specifying all the + individual -f*-prefix-map options. This can be used to make reproducible + builds that are location independent. + +Specifically, this additionally enables -fmacro-prefix-map=, which causes +prefix mapping to be applied to expansions of __FILE__ and similar macros. + +Without this option, if source files are compiled by passing the +absolute file path to the compiler (as done by e.g. cmake), any +expansions of __FILE__ (e.g. from uses of assert()) will contain +$srcdir. + +Signed-off-by: Allan McRae <allan@archlinux.org> +--- + scripts/libmakepkg/buildenv/debugflags.sh.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in +index e0a1ed00..84ca7b71 100644 +--- a/scripts/libmakepkg/buildenv/debugflags.sh.in ++++ b/scripts/libmakepkg/buildenv/debugflags.sh.in +@@ -30,8 +30,8 @@ buildenv_functions+=('buildenv_debugflags') + + buildenv_debugflags() { + if check_option "debug" "y"; then +- DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" +- DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" ++ DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" ++ DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + CFLAGS+=" $DEBUG_CFLAGS" + CXXFLAGS+=" $DEBUG_CXXFLAGS" |