[arch-commits] Commit in pacman/repos/testing-x86_64 (16 files)
Levente Polyak
anthraxx at gemini.archlinux.org
Wed Jul 20 20:26:28 UTC 2022
Date: Wednesday, July 20, 2022 @ 20:26:28
Author: anthraxx
Revision: 451514
archrelease: copy trunk to testing-x86_64
Added:
pacman/repos/testing-x86_64/PKGBUILD
(from rev 451513, pacman/trunk/PKGBUILD)
pacman/repos/testing-x86_64/add-flto-to-LDFLAGS-for-clang.patch
(from rev 451513, pacman/trunk/add-flto-to-LDFLAGS-for-clang.patch)
pacman/repos/testing-x86_64/keys/
pacman/repos/testing-x86_64/libmakepkg-add-extra-buildflags-only-when-buildflags.patch
(from rev 451513, pacman/trunk/libmakepkg-add-extra-buildflags-only-when-buildflags.patch)
pacman/repos/testing-x86_64/make-link-time-optimization-flags-configurable.patch
(from rev 451513, pacman/trunk/make-link-time-optimization-flags-configurable.patch)
pacman/repos/testing-x86_64/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
(from rev 451513, pacman/trunk/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch)
pacman/repos/testing-x86_64/makepkg.conf
(from rev 451513, pacman/trunk/makepkg.conf)
pacman/repos/testing-x86_64/pacman.conf
(from rev 451513, pacman/trunk/pacman.conf)
Deleted:
pacman/repos/testing-x86_64/PKGBUILD
pacman/repos/testing-x86_64/add-flto-to-LDFLAGS-for-clang.patch
pacman/repos/testing-x86_64/keys/
pacman/repos/testing-x86_64/libmakepkg-add-extra-buildflags-only-when-buildflags.patch
pacman/repos/testing-x86_64/make-link-time-optimization-flags-configurable.patch
pacman/repos/testing-x86_64/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
pacman/repos/testing-x86_64/makepkg.conf
pacman/repos/testing-x86_64/pacman.conf
------------------------------------------------------------+
PKGBUILD | 159 ++---
add-flto-to-LDFLAGS-for-clang.patch | 48 -
libmakepkg-add-extra-buildflags-only-when-buildflags.patch | 82 +-
make-link-time-optimization-flags-configurable.patch | 216 +++----
makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch | 80 +-
makepkg.conf | 318 +++++------
pacman.conf | 200 +++---
7 files changed, 552 insertions(+), 551 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-20 20:26:19 UTC (rev 451513)
+++ PKGBUILD 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,79 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# Maintainer:
-
-pkgname=pacman
-pkgver=6.0.1
-pkgrel=6
-pkgdesc="A library-based package manager with dependency support"
-arch=('x86_64')
-url="https://www.archlinux.org/pacman/"
-license=('GPL')
-groups=('base-devel')
-depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist')
-makedepends=('meson' 'asciidoc' 'doxygen')
-checkdepends=('python' 'fakechroot')
-optdepends=('perl-locale-gettext: translation support in makepkg-template')
-provides=('libalpm.so')
-backup=(etc/pacman.conf
- etc/makepkg.conf)
-options=('strip' 'debug')
-validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan at archlinux.org>
- 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
-source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}
- "fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch"
- add-flto-to-LDFLAGS-for-clang.patch
- makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
- libmakepkg-add-extra-buildflags-only-when-buildflags.patch
- make-link-time-optimization-flags-configurable.patch
- pacman.conf
- makepkg.conf)
-sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731'
- 'SKIP'
- '8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c'
- '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223'
- 'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582'
- '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278'
- '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a'
- '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7'
- '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6')
-
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch
- patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
- patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch
- patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch
- patch -Np1 -i ../fix-wkd-lookup.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- meson --prefix=/usr \
- --buildtype=plain \
- -Ddoc=enabled \
- -Ddoxygen=enabled \
- -Dscriptlet-shell=/usr/bin/bash \
- -Dldconfig=/usr/bin/ldconfig \
- build
-
- meson compile -C build
-}
-
-check() {
- cd "$pkgname-$pkgver"
-
- meson test -C build
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- DESTDIR="$pkgdir" meson install -C build
-
- # install Arch specific stuff
- install -dm755 "$pkgdir/etc"
- install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
- install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
-}
Copied: pacman/repos/testing-x86_64/PKGBUILD (from rev 451513, pacman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,80 @@
+# vim: set ts=2 sw=2 et:
+# Maintainer:
+
+pkgname=pacman
+pkgver=6.0.1
+pkgrel=7
+pkgdesc="A library-based package manager with dependency support"
+arch=('x86_64')
+url="https://www.archlinux.org/pacman/"
+license=('GPL')
+groups=('base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist'
+ 'gettext' 'gawk' 'coreutils' 'gnupg' 'grep')
+makedepends=('meson' 'asciidoc' 'doxygen')
+checkdepends=('python' 'fakechroot')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
+provides=('libalpm.so')
+backup=(etc/pacman.conf
+ etc/makepkg.conf)
+options=('strip' 'debug')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan at archlinux.org>
+ 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}
+ "fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch"
+ add-flto-to-LDFLAGS-for-clang.patch
+ makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
+ libmakepkg-add-extra-buildflags-only-when-buildflags.patch
+ make-link-time-optimization-flags-configurable.patch
+ pacman.conf
+ makepkg.conf)
+sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731'
+ 'SKIP'
+ '8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c'
+ '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223'
+ 'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582'
+ '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278'
+ '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a'
+ '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7'
+ '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6')
+
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch
+ patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
+ patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch
+ patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch
+ patch -Np1 -i ../fix-wkd-lookup.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ meson --prefix=/usr \
+ --buildtype=plain \
+ -Ddoc=enabled \
+ -Ddoxygen=enabled \
+ -Dscriptlet-shell=/usr/bin/bash \
+ -Dldconfig=/usr/bin/ldconfig \
+ build
+
+ meson compile -C build
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ meson test -C build
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ DESTDIR="$pkgdir" meson install -C build
+
+ # install Arch specific stuff
+ install -dm755 "$pkgdir/etc"
+ install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
+ install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+}
Deleted: add-flto-to-LDFLAGS-for-clang.patch
===================================================================
--- add-flto-to-LDFLAGS-for-clang.patch 2022-07-20 20:26:19 UTC (rev 451513)
+++ add-flto-to-LDFLAGS-for-clang.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,24 +0,0 @@
-From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan at archlinux.org>
-Date: Fri, 24 Dec 2021 17:59:32 +1000
-Subject: [PATCH] LTO: Add -flto to LDFLAGS for clang
-
-GCC automatically detects when it is linking LTO objects, but clang does
-not. Add -flto to LDFLAGS to make this work for clang too.
-
-Signed-off-by: Allan McRae <allan at archlinux.org>
----
- scripts/libmakepkg/buildenv/lto.sh.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
-index 1f1ca53f..c3bd0fa4 100644
---- a/scripts/libmakepkg/buildenv/lto.sh.in
-+++ b/scripts/libmakepkg/buildenv/lto.sh.in
-@@ -33,5 +33,6 @@ buildenv_lto() {
- if check_option "lto" "y"; then
- CFLAGS+=" -flto"
- CXXFLAGS+=" -flto"
-+ LDFLAGS+=" -flto"
- fi
- }
Copied: pacman/repos/testing-x86_64/add-flto-to-LDFLAGS-for-clang.patch (from rev 451513, pacman/trunk/add-flto-to-LDFLAGS-for-clang.patch)
===================================================================
--- add-flto-to-LDFLAGS-for-clang.patch (rev 0)
+++ add-flto-to-LDFLAGS-for-clang.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,24 @@
+From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan at archlinux.org>
+Date: Fri, 24 Dec 2021 17:59:32 +1000
+Subject: [PATCH] LTO: Add -flto to LDFLAGS for clang
+
+GCC automatically detects when it is linking LTO objects, but clang does
+not. Add -flto to LDFLAGS to make this work for clang too.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+---
+ scripts/libmakepkg/buildenv/lto.sh.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
+index 1f1ca53f..c3bd0fa4 100644
+--- a/scripts/libmakepkg/buildenv/lto.sh.in
++++ b/scripts/libmakepkg/buildenv/lto.sh.in
+@@ -33,5 +33,6 @@ buildenv_lto() {
+ if check_option "lto" "y"; then
+ CFLAGS+=" -flto"
+ CXXFLAGS+=" -flto"
++ LDFLAGS+=" -flto"
+ fi
+ }
Deleted: libmakepkg-add-extra-buildflags-only-when-buildflags.patch
===================================================================
--- libmakepkg-add-extra-buildflags-only-when-buildflags.patch 2022-07-20 20:26:19 UTC (rev 451513)
+++ libmakepkg-add-extra-buildflags-only-when-buildflags.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,41 +0,0 @@
-From 42fe4864a0c8e2846007ffee532fe0cf4b321cdd Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan at archlinux.org>
-Date: Sun, 9 Jan 2022 12:45:58 +1000
-Subject: [PATCH] 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>
----
- scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +-
- scripts/libmakepkg/buildenv/lto.sh.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in
-index 84ca7b71..1cb58613 100644
---- a/scripts/libmakepkg/buildenv/debugflags.sh.in
-+++ b/scripts/libmakepkg/buildenv/debugflags.sh.in
-@@ -29,7 +29,7 @@ source "$LIBRARY/util/option.sh"
- buildenv_functions+=('buildenv_debugflags')
-
- buildenv_debugflags() {
-- if check_option "debug" "y"; then
-+ if check_option "debug" "y" && ! check_option "buildflags" "n"; then
- 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}"
-diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
-index 081d5648..6e500eab 100644
---- a/scripts/libmakepkg/buildenv/lto.sh.in
-+++ b/scripts/libmakepkg/buildenv/lto.sh.in
-@@ -30,7 +30,7 @@ build_options+=('lto')
- buildenv_functions+=('buildenv_lto')
-
- buildenv_lto() {
-- if check_option "lto" "y"; then
-+ if check_option "lto" "y" && ! check_option "buildflags" "n"; then
- CFLAGS+=" -flto"
- CXXFLAGS+=" -flto"
- LDFLAGS+=" -flto"
Copied: pacman/repos/testing-x86_64/libmakepkg-add-extra-buildflags-only-when-buildflags.patch (from rev 451513, pacman/trunk/libmakepkg-add-extra-buildflags-only-when-buildflags.patch)
===================================================================
--- libmakepkg-add-extra-buildflags-only-when-buildflags.patch (rev 0)
+++ libmakepkg-add-extra-buildflags-only-when-buildflags.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,41 @@
+From 42fe4864a0c8e2846007ffee532fe0cf4b321cdd Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan at archlinux.org>
+Date: Sun, 9 Jan 2022 12:45:58 +1000
+Subject: [PATCH] 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>
+---
+ scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +-
+ scripts/libmakepkg/buildenv/lto.sh.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in
+index 84ca7b71..1cb58613 100644
+--- a/scripts/libmakepkg/buildenv/debugflags.sh.in
++++ b/scripts/libmakepkg/buildenv/debugflags.sh.in
+@@ -29,7 +29,7 @@ source "$LIBRARY/util/option.sh"
+ buildenv_functions+=('buildenv_debugflags')
+
+ buildenv_debugflags() {
+- if check_option "debug" "y"; then
++ if check_option "debug" "y" && ! check_option "buildflags" "n"; then
+ 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}"
+diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
+index 081d5648..6e500eab 100644
+--- a/scripts/libmakepkg/buildenv/lto.sh.in
++++ b/scripts/libmakepkg/buildenv/lto.sh.in
+@@ -30,7 +30,7 @@ build_options+=('lto')
+ buildenv_functions+=('buildenv_lto')
+
+ buildenv_lto() {
+- if check_option "lto" "y"; then
++ if check_option "lto" "y" && ! check_option "buildflags" "n"; then
+ CFLAGS+=" -flto"
+ CXXFLAGS+=" -flto"
+ LDFLAGS+=" -flto"
Deleted: make-link-time-optimization-flags-configurable.patch
===================================================================
--- make-link-time-optimization-flags-configurable.patch 2022-07-20 20:26:19 UTC (rev 451513)
+++ make-link-time-optimization-flags-configurable.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,108 +0,0 @@
-From e1ce2351f5c00dd90104e0f4ce3bf176da28af08 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Thu, 10 Feb 2022 05:15:01 +0200
-Subject: [PATCH] Make link time optimization flags configurable
-
-We want to use -flto=auto in Arch Linux to speed up building, but we
-can't hardcode it in buildenv/lto.sh because other downstreams might
-have clang < 13.0.0 which did not recognize -flto=auto as equivalent
-to -flto=full.
-
-Introducing an LTOFLAGS variable to makepkg.conf seems the way to go.
-
-Signed-off-by: Allan McRae <allan at archlinux.org>
----
- doc/makepkg.conf.5.asciidoc | 10 ++++++++--
- etc/makepkg.conf.in | 1 +
- scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +-
- scripts/libmakepkg/buildenv/lto.sh.in | 6 +++---
- scripts/libmakepkg/lint_config/variable.sh.in | 8 ++++----
- 5 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc
-index 39c5c808..a0d9a6d4 100644
---- a/doc/makepkg.conf.5.asciidoc
-+++ b/doc/makepkg.conf.5.asciidoc
-@@ -81,6 +81,11 @@ Options
- usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on
- available linker flags.
-
-+**LTOFLAGS=**"ltoflags"::
-+ Additional compiler and linker flags appended to `CFLAGS`, `CXXFLAGS`
-+ and `LDFLAGS` when building with link time optimization. If empty,
-+ ``-flto'' is used.
-+
- **MAKEFLAGS=**"makeflags"::
- This is often used to set the number of jobs used; for example, `-j2`.
- Other flags that make accepts can also be passed.
-@@ -190,8 +195,9 @@ Options
- package containing the debug symbols when used with `strip'.
-
- *lto*;;
-- Enable building packages using link time optimization. Adds '-flto'
-- to both CFLAGS and CXXFLAGS.
-+ Enable building packages using link time optimization. Adds the
-+ flags specified in LTOFLAGS to CFLAGS, CXXFLAGS and LDFLAGS (or
-+ ``-flto'' if LTOFLAGS is empty).
-
- *autodep*;;
- Enable the automatic addition of libraries to the depends and
-diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
-index 0c911cce..edc5f442 100644
---- a/etc/makepkg.conf.in
-+++ b/etc/makepkg.conf.in
-@@ -41,6 +41,7 @@ CHOST="@CHOST@"
- #CFLAGS="-O2 -pipe"
- #CXXFLAGS="-O2 -pipe"
- #LDFLAGS=""
-+#LTOFLAGS="-flto"
- #RUSTFLAGS="-C opt-level=2"
- #-- Make Flags: change this for DistCC/SMP systems
- #MAKEFLAGS="-j2"
-diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in
-index 74f91988..07b4a730 100644
---- a/scripts/libmakepkg/buildenv/buildflags.sh.in
-+++ b/scripts/libmakepkg/buildenv/buildflags.sh.in
-@@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags')
-
- buildenv_buildflags() {
- if check_option "buildflags" "n"; then
-- unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
-+ unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS LTOFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
- fi
- }
-diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
-index 6e500eab..6492def7 100644
---- a/scripts/libmakepkg/buildenv/lto.sh.in
-+++ b/scripts/libmakepkg/buildenv/lto.sh.in
-@@ -31,8 +31,8 @@ buildenv_functions+=('buildenv_lto')
-
- buildenv_lto() {
- if check_option "lto" "y" && ! check_option "buildflags" "n"; then
-- CFLAGS+=" -flto"
-- CXXFLAGS+=" -flto"
-- LDFLAGS+=" -flto"
-+ CFLAGS+=" ${LTOFLAGS:--flto}"
-+ CXXFLAGS+=" ${LTOFLAGS:--flto}"
-+ LDFLAGS+=" ${LTOFLAGS:--flto}"
- fi
- }
-diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in
-index 8327b0a5..03a67ee2 100644
---- a/scripts/libmakepkg/lint_config/variable.sh.in
-+++ b/scripts/libmakepkg/lint_config/variable.sh.in
-@@ -32,10 +32,10 @@ lint_config_variables() {
- local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS
- DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ
- COMPRESSLRZ COMPRESSLZO COMPRESSZ)
-- local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS DEBUG_CFLAGS
-- DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES
-- STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER
-- GPGKEY PKGEXT SRCEXT)
-+ local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS LTOFLAGS
-+ DEBUG_CFLAGS DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR
-+ STRIP_BINARIES STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST
-+ LOGDEST PACKAGER GPGKEY PKGEXT SRCEXT)
-
- local i keys ret=0
-
Copied: pacman/repos/testing-x86_64/make-link-time-optimization-flags-configurable.patch (from rev 451513, pacman/trunk/make-link-time-optimization-flags-configurable.patch)
===================================================================
--- make-link-time-optimization-flags-configurable.patch (rev 0)
+++ make-link-time-optimization-flags-configurable.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,108 @@
+From e1ce2351f5c00dd90104e0f4ce3bf176da28af08 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Thu, 10 Feb 2022 05:15:01 +0200
+Subject: [PATCH] Make link time optimization flags configurable
+
+We want to use -flto=auto in Arch Linux to speed up building, but we
+can't hardcode it in buildenv/lto.sh because other downstreams might
+have clang < 13.0.0 which did not recognize -flto=auto as equivalent
+to -flto=full.
+
+Introducing an LTOFLAGS variable to makepkg.conf seems the way to go.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+---
+ doc/makepkg.conf.5.asciidoc | 10 ++++++++--
+ etc/makepkg.conf.in | 1 +
+ scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +-
+ scripts/libmakepkg/buildenv/lto.sh.in | 6 +++---
+ scripts/libmakepkg/lint_config/variable.sh.in | 8 ++++----
+ 5 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc
+index 39c5c808..a0d9a6d4 100644
+--- a/doc/makepkg.conf.5.asciidoc
++++ b/doc/makepkg.conf.5.asciidoc
+@@ -81,6 +81,11 @@ Options
+ usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on
+ available linker flags.
+
++**LTOFLAGS=**"ltoflags"::
++ Additional compiler and linker flags appended to `CFLAGS`, `CXXFLAGS`
++ and `LDFLAGS` when building with link time optimization. If empty,
++ ``-flto'' is used.
++
+ **MAKEFLAGS=**"makeflags"::
+ This is often used to set the number of jobs used; for example, `-j2`.
+ Other flags that make accepts can also be passed.
+@@ -190,8 +195,9 @@ Options
+ package containing the debug symbols when used with `strip'.
+
+ *lto*;;
+- Enable building packages using link time optimization. Adds '-flto'
+- to both CFLAGS and CXXFLAGS.
++ Enable building packages using link time optimization. Adds the
++ flags specified in LTOFLAGS to CFLAGS, CXXFLAGS and LDFLAGS (or
++ ``-flto'' if LTOFLAGS is empty).
+
+ *autodep*;;
+ Enable the automatic addition of libraries to the depends and
+diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
+index 0c911cce..edc5f442 100644
+--- a/etc/makepkg.conf.in
++++ b/etc/makepkg.conf.in
+@@ -41,6 +41,7 @@ CHOST="@CHOST@"
+ #CFLAGS="-O2 -pipe"
+ #CXXFLAGS="-O2 -pipe"
+ #LDFLAGS=""
++#LTOFLAGS="-flto"
+ #RUSTFLAGS="-C opt-level=2"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"
+diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in
+index 74f91988..07b4a730 100644
+--- a/scripts/libmakepkg/buildenv/buildflags.sh.in
++++ b/scripts/libmakepkg/buildenv/buildflags.sh.in
+@@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags')
+
+ buildenv_buildflags() {
+ if check_option "buildflags" "n"; then
+- unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
++ unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS LTOFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
+ fi
+ }
+diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
+index 6e500eab..6492def7 100644
+--- a/scripts/libmakepkg/buildenv/lto.sh.in
++++ b/scripts/libmakepkg/buildenv/lto.sh.in
+@@ -31,8 +31,8 @@ buildenv_functions+=('buildenv_lto')
+
+ buildenv_lto() {
+ if check_option "lto" "y" && ! check_option "buildflags" "n"; then
+- CFLAGS+=" -flto"
+- CXXFLAGS+=" -flto"
+- LDFLAGS+=" -flto"
++ CFLAGS+=" ${LTOFLAGS:--flto}"
++ CXXFLAGS+=" ${LTOFLAGS:--flto}"
++ LDFLAGS+=" ${LTOFLAGS:--flto}"
+ fi
+ }
+diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in
+index 8327b0a5..03a67ee2 100644
+--- a/scripts/libmakepkg/lint_config/variable.sh.in
++++ b/scripts/libmakepkg/lint_config/variable.sh.in
+@@ -32,10 +32,10 @@ lint_config_variables() {
+ local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS
+ DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ
+ COMPRESSLRZ COMPRESSLZO COMPRESSZ)
+- local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS DEBUG_CFLAGS
+- DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES
+- STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER
+- GPGKEY PKGEXT SRCEXT)
++ local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS LTOFLAGS
++ DEBUG_CFLAGS DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR
++ STRIP_BINARIES STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST
++ LOGDEST PACKAGER GPGKEY PKGEXT SRCEXT)
+
+ local i keys ret=0
+
Deleted: makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch
===================================================================
--- makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch 2022-07-20 20:26:19 UTC (rev 451513)
+++ makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,40 +0,0 @@
-From e37f7d8b6b4d2f9accf97eb96d0eacbddf2a1345 Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza at 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 at 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"
Copied: pacman/repos/testing-x86_64/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch (from rev 451513, pacman/trunk/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch)
===================================================================
--- makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch (rev 0)
+++ makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,40 @@
+From e37f7d8b6b4d2f9accf97eb96d0eacbddf2a1345 Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza at 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 at 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"
Deleted: makepkg.conf
===================================================================
--- makepkg.conf 2022-07-20 20:26:19 UTC (rev 451513)
+++ makepkg.conf 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,159 +0,0 @@
-#!/hint/bash
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-# Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
- 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
- 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'rsync::/usr/bin/rsync --no-motd -z %u %o'
- 'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#-- The package required by makepkg to download VCS sources
-# Format: 'protocol::package'
-VCSCLIENTS=('bzr::bzr'
- 'fossil::fossil'
- 'git::git'
- 'hg::mercurial'
- 'svn::subversion')
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="x86_64"
-CHOST="x86_64-pc-linux-gnu"
-
-#-- Compiler and Linker Flags
-#CPPFLAGS=""
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
- -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
- -fstack-clash-protection -fcf-protection"
-CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-LTOFLAGS="-flto=auto"
-#RUSTFLAGS="-C opt-level=2"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-#-- Debugging flags
-DEBUG_CFLAGS="-g"
-DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
-# A negated environment option will do the opposite of the comments below.
-#
-#-- distcc: Use the Distributed C/C++/ObjC compiler
-#-- color: Colorize output messages
-#-- ccache: Use ccache to cache compilation
-#-- check: Run the check() function if present in the PKGBUILD
-#-- sign: Generate PGP signature file
-#
-BUILDENV=(!distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-# These are default values for the options=() settings
-#########################################################################
-#
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
-# A negated option will do the opposite of the comments below.
-#
-#-- strip: Strip symbols from binaries/libraries
-#-- docs: Save doc directories specified by DOC_DIRS
-#-- libtool: Leave libtool (.la) files in packages
-#-- staticlibs: Leave static library (.a) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge: Remove files specified by PURGE_TARGETS
-#-- debug: Add debugging flags as specified in DEBUG_* variables
-#-- lto: Add compile flags for building with link time optimization
-#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(sha256)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-#-- Directory to store source code in for debug packages
-DBGSRCDIR="/usr/src/debug"
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john at doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# COMPRESSION DEFAULTS
-#########################################################################
-#
-COMPRESSGZ=(gzip -c -f -n)
-COMPRESSBZ2=(bzip2 -c -f)
-COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -z -q -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
-COMPRESSZ=(compress -c -f)
-COMPRESSLZ4=(lz4 -q)
-COMPRESSLZ=(lzip -c -f)
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-PKGEXT='.pkg.tar.zst'
-SRCEXT='.src.tar.gz'
-
-#########################################################################
-# OTHER
-#########################################################################
-#
-#-- Command used to run pacman as root, instead of trying sudo and su
-#PACMAN_AUTH=()
Copied: pacman/repos/testing-x86_64/makepkg.conf (from rev 451513, pacman/trunk/makepkg.conf)
===================================================================
--- makepkg.conf (rev 0)
+++ makepkg.conf 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,159 @@
+#!/hint/bash
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+# Format: 'protocol::agent'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+ 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+ 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+ 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+ 'rsync::/usr/bin/rsync --no-motd -z %u %o'
+ 'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/wget
+
+#-- The package required by makepkg to download VCS sources
+# Format: 'protocol::package'
+VCSCLIENTS=('bzr::bzr'
+ 'fossil::fossil'
+ 'git::git'
+ 'hg::mercurial'
+ 'svn::subversion')
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="x86_64"
+CHOST="x86_64-pc-linux-gnu"
+
+#-- Compiler and Linker Flags
+#CPPFLAGS=""
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+ -fstack-clash-protection -fcf-protection"
+CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+LTOFLAGS="-flto=auto"
+#RUSTFLAGS="-C opt-level=2"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g"
+DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# A negated environment option will do the opposite of the comments below.
+#
+#-- distcc: Use the Distributed C/C++/ObjC compiler
+#-- color: Colorize output messages
+#-- ccache: Use ccache to cache compilation
+#-- check: Run the check() function if present in the PKGBUILD
+#-- sign: Generate PGP signature file
+#
+BUILDENV=(!distcc color !ccache check !sign)
+#
+#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
+#-- specify a space-delimited list of hosts running in the DistCC cluster.
+#DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+# These are default values for the options=() settings
+#########################################################################
+#
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
+# A negated option will do the opposite of the comments below.
+#
+#-- strip: Strip symbols from binaries/libraries
+#-- docs: Save doc directories specified by DOC_DIRS
+#-- libtool: Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge: Remove files specified by PURGE_TARGETS
+#-- debug: Add debugging flags as specified in DEBUG_* variables
+#-- lto: Add compile flags for building with link time optimization
+#
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
+INTEGRITY_CHECK=(sha256)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Log files: specify a fixed directory where all log files will be placed
+#LOGDEST=/home/makepkglogs
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john at doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
+
+#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -z -q -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+PKGEXT='.pkg.tar.zst'
+SRCEXT='.src.tar.gz'
+
+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+#PACMAN_AUTH=()
Deleted: pacman.conf
===================================================================
--- pacman.conf 2022-07-20 20:26:19 UTC (rev 451513)
+++ pacman.conf 2022-07-20 20:26:28 UTC (rev 451514)
@@ -1,100 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir = /
-#DBPath = /var/lib/pacman/
-#CacheDir = /var/cache/pacman/pkg/
-#LogFile = /var/log/pacman.log
-#GPGDir = /etc/pacman.d/gnupg/
-#HookDir = /etc/pacman.d/hooks/
-HoldPkg = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg =
-#IgnoreGroup =
-
-#NoUpgrade =
-#NoExtract =
-
-# Misc options
-#UseSyslog
-#Color
-#NoProgressBar
-CheckSpace
-#VerbosePkgLists
-#ParallelDownloads = 5
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-# - can be defined here or included from another file
-# - pacman will search repositories in the order defined here
-# - local/custom mirrors can be added here or in separate files
-# - repositories listed first will take precedence when packages
-# have identical names, regardless of version number
-# - URLs will have $repo replaced by the name of the current repo
-# - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-# [repo-name]
-# Server = ServerName
-# Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository. See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
Copied: pacman/repos/testing-x86_64/pacman.conf (from rev 451513, pacman/trunk/pacman.conf)
===================================================================
--- pacman.conf (rev 0)
+++ pacman.conf 2022-07-20 20:26:28 UTC (rev 451514)
@@ -0,0 +1,100 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir = /
+#DBPath = /var/lib/pacman/
+#CacheDir = /var/cache/pacman/pkg/
+#LogFile = /var/log/pacman.log
+#GPGDir = /etc/pacman.d/gnupg/
+#HookDir = /etc/pacman.d/hooks/
+HoldPkg = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg =
+#IgnoreGroup =
+
+#NoUpgrade =
+#NoExtract =
+
+# Misc options
+#UseSyslog
+#Color
+#NoProgressBar
+CheckSpace
+#VerbosePkgLists
+#ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+# - can be defined here or included from another file
+# - pacman will search repositories in the order defined here
+# - local/custom mirrors can be added here or in separate files
+# - repositories listed first will take precedence when packages
+# have identical names, regardless of version number
+# - URLs will have $repo replaced by the name of the current repo
+# - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+# [repo-name]
+# Server = ServerName
+# Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository. See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
More information about the arch-commits
mailing list