[Git][pacman/pacman][master] 10 commits: makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map

Thu Jan 13 03:50:34 UTC 2022

Allan McRae pushed to branch master at Pacman / Pacman

Commits:
e37f7d8b by Xiretza at 2022-01-02T17:42:43+10:00
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 at archlinux.org>

- - - - -
0be1d4e5 by Allan McRae at 2022-01-02T18:06:15+10:00
Remove parsing of long removed files in .PKGINFO

These fields have not existed for many years.

Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
2fe1ba5d by Morten Linderud at 2022-01-02T18:15:11+10:00
makepkg: Use pkgbase in pkgdesc for debug packages

When trying to identify debug packages among other packages we
discovered that it's pkgname used in pkgdesc. Since pkgname can
sometimes be an array when building debug packages for a split package,
this could potentially include a pkgname that might not make sense
depending on the order of the array.

This patch simply uses pkgbase as it seems more correct.

Signed-off-by: Morten Linderud <morten at linderud.pw>
Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
e654aa8a by Sefa Eyeoglu at 2022-01-02T20:55:11+10:00
pacman: support multiple chomps at the same time

When two progressbars are present, one of them always had c while the
other always had C as the mouth

Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
446972b4 by Sefa Eyeoglu at 2022-01-02T20:57:42+10:00
pacman: simplify chomp mouth logic

Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
a8d9fb8d by Jonathan Sköld at 2022-01-02T21:39:10+10:00
Print the target arch when using the %a format specifier

Adds the %a format specifier to allow printing of a target's arch
when using --print-format.

Signed-off-by: Jonathan Sköld <arch at skold.dev>
Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
42fe4864 by Allan McRae at 2022-01-09T12:45:58+10:00
libmakepkg: add extra buildflags only when buildflags is not disabled

This means options=('!buildflags') will disable the addition of CFLAG
etc for LTO and debug building.

Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
ae2f506d by Morten Linderud at 2022-01-09T13:58:12+10:00
strip: Use debugedit instead of AWK to parse source files

This moves us from the fairly ugly AWK parsing line to debugedit which
originally comes out of the rpm project.

The original code has issues parsing anything that was not straight
C/C++ and languages like Rust or Go would return invalid source code
files. debugedit handles all these cases better.

Fixes FS#66755
Fixes FS#66888
Fixes FS#65677

Signed-off-by: Morten Linderud <morten at linderud.pw>
Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
241c29f0 by Morten Linderud at 2022-01-09T14:03:16+10:00
makepkg: Implement pkgtype in .PKGINFO

This implements pkgtype into .PKGINFO. This is useful to ensure tools
parsing packages do not miss important context on the creation of the
package.

For instance discovering if a given .pkg.tar is a debug package, one
would have to do heuristics on the pkgdesc and "${pkgbase}-debug".
However both of these values are controlled by the packager.

Similarly, the heuristic for discovering split packages is if pkgbase
and pkgname differ, which can happen in any package as both values are
packager controlled.

This should ensure we don't need to rely on heuristics and instead
include the context of how the package was created.

Signed-off-by: Morten Linderud <morten at linderud.pw>
Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -
49b08fa9 by Allan McRae at 2022-01-13T13:45:42+10:00
libmakepkg/autodep: fix module name

Signed-off-by: Allan McRae <allan at archlinux.org>

- - - - -

10 changed files:

- doc/pacman.8.asciidoc
- lib/libalpm/be_package.c
- scripts/libmakepkg/autodep/meson.build
- scripts/libmakepkg/buildenv/debugflags.sh.in
- scripts/libmakepkg/buildenv/lto.sh.in
- + scripts/libmakepkg/executable/debugedit.sh.in
- scripts/libmakepkg/tidy/strip.sh.in
- scripts/makepkg.sh.in
- src/pacman/callback.c
- src/pacman/util.c

View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/90df85e9cf2fef38442345ea3171300399f3ca98...49b08fa9d14a9cc06f01c624c644cb987ce97642

-- 
View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/90df85e9cf2fef38442345ea3171300399f3ca98...49b08fa9d14a9cc06f01c624c644cb987ce97642
You're receiving this email because of your account on gitlab.archlinux.org.