diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 917674e39..22b55b619 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,5 +1,6 @@ # vim: set ts=2 sw=2 et: -# Maintainer: +# Maintainer: Levente Polyak +# Maintainer: Morten Linderud # ALARM: Kevin Mihelich # - arch/host/flags for arm, armv6h, armv7h, and aarch64 @@ -10,8 +11,8 @@ # - patch to fix application/gzip change in file 5.37 pkgname=pacman -pkgver=6.0.1 -pkgrel=8 +pkgver=6.0.2 +pkgrel=5 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -29,43 +30,39 @@ options=('strip' 'debug') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) 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" - "patch-updatedb.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/58d678fa289034f1fe2a56adbb5e496b774755fc.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-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch + pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch + pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch + pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch 0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch pacman.conf makepkg.conf) -sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731' +sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' 'SKIP' - '8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c' - '988acbb76a0bbd866ab76121191ba4a968bf12970d581fb81b47504c4d998e96' - '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223' - 'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582' - '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278' - '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a' - 'f9a8ae2805cc995ef1b787e10f402d574aaee183cc3a23fe26805555b7d87fea' - '7beb2faec0ec37dcb2050d9ed3c95353fb7f73da7e3bbe0e226e9e3f7858a01f' - '0fdbdc3c86b826fe87d8051a5d34db23b366b0a7bdc22f3701b1bf2b01218d59' + '522b789e442b3bb3afa7ea3fa417a99554f36ec00de3986cbe92c80f09a7db99' + 'dab7c70fb9d77d702069bb57f5a12496b463d68ae20460fb0a3ffcb4791321a9' + '0b56c61eac3d9425d68faa2eccbaefdc5ed422b643974ae829eaca0460043da1' + 'acd0b149b6324dc1eca3cd2d3b30df6ef64c5653e83523d77200ec593e01d2a7' + 'ba91c92fbae492be13df12dd34e22b00e1a63c706fdd328e8d9a907c5d517e71' + 'bb8d53dd1136c314aacbc275f36936112d04ec6c0ebc882eefe6e46bd86e6db5' + '11b3ed535d0cb981ce5927ed9b308615e4f6b6a8e2aef6e2e15a59df956bfdab' '19f189accab294af7085cb709417eb41784d21aa8da07a8aa24bf7591ec3ce94' 'd001efcbcbe97e4be27639cb7709813a40803e8aead8f544fc7c5b92fb64b062') 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 - patch -Np1 -i ../patch-updatedb.patch - - patch -p1 -i ../0001-Sychronize-filesystem.patch - patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch - patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch + # we backport way too often in pacman + # lets at least make it more convenient + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" + done } build() { diff --git a/core/pacman/add-flto-to-LDFLAGS-for-clang.patch b/core/pacman/add-flto-to-LDFLAGS-for-clang.patch deleted file mode 100644 index b3c139de4..000000000 --- a/core/pacman/add-flto-to-LDFLAGS-for-clang.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001 -From: Allan McRae -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 ---- - 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 - } diff --git a/core/pacman/keys/pgp/6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD.asc b/core/pacman/keys/pgp/6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD.asc new file mode 100644 index 000000000..e51d07208 --- /dev/null +++ b/core/pacman/keys/pgp/6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD.asc @@ -0,0 +1,42 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=v6ru +-----END PGP PUBLIC KEY BLOCK----- diff --git a/core/pacman/keys/pgp/B8151B117037781095514CA7BBDFFC92306B1121.asc b/core/pacman/keys/pgp/B8151B117037781095514CA7BBDFFC92306B1121.asc new file mode 100644 index 000000000..815bd0d84 --- /dev/null +++ b/core/pacman/keys/pgp/B8151B117037781095514CA7BBDFFC92306B1121.asc @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFkzYd8BCACzbJ4/p1ZgnqgqQuM8Unw0YDD1sTMyZZZfoHTWKaXSo4TdyQcF +67epUEgOZEuVXD3QEvkXdPtlQyHXC6NhIt+4GCkM23op84A2halQt8hfpQ6cwjaM +QdHCHzbkkff/zY9KqrgDs/z0wwedVf/YeWvEdZbMmo2cjdL7eJRAIbjRa+ONgMWY +SlNvrJSWnRDccOxX0iZzGZgfmkO46DPYXvKU3C5UvxYw6iMj6gFuRpmnfQ8g+uZ/ +44ZUcm9WAoxJANzEdrNzZDkTC36vXiccc83E8Wzubk4ENS2wyjzZEA8I62CwjYRx +hPHgiX7QeTypzRHzXtuKYs9Pfft1RSaPEy05ABEBAAG0LkFuZHJldyBHcmVnb3J5 +IChwYWNtYW4pIDxhbmRyZXdAYXJjaGxpbnV4Lm9yZz6JAVQEEwEIAD4CGwMFCwkI +BwIGFQgJCgsCBBYCAwECHgECF4AWIQS4FRsRcDd4EJVRTKe73/ySMGsRIQUCYQd/ +HAUJCbVQvQAKCRC73/ySMGsRIRc3B/9caddy4FAwytcig1AX4lS5fcQBqpRBdIe6 +jQ2lw8+0rz7JjasxC5X6M/G+CPglbO+1E55VTE+RBFeVENV5ub6kr0iAaaU5MuIO +0b9P270QRHg60EDNXbV1nauPOn0eo4I8gIOK1ORlLZt3fjPYCLh0GRiO/HNZ+5f7 +LK2TS+jFLHxWXyg6a1ffgKlbYzlr+v2s1RvnNqjwQi0Kvyci+rxAOnhQlP1XkPeK +2iqp7OiqkdmNQE0B4bgXJZtfbac02mUYBao3d5Uk5d+3Xl4WVY0leTeo9YOcx9gD +Ry7mDIuQVw/1nK/KTM/d7BMMC/RLJMASvThyWysW1GdqVRYCOPz6uQENBFkzYd8B +CAC3jGpLFHTMCFNdiCgs7d+YfLeQc66OlqbYqo1KQlTDYsifuokOPy0ukUU0DXLK +RRgsEqsIal5WAkHnZFJb0oo6NfuQMZYOLoaDK358ll4VhGg7W8rYIWMeQ/JgPwjd +GRhJFkrdDG/wEmvoEQGLvM3OwQGB1uGTG0BNVK+vcCZo7s7WQcfJCQTE+kQsp7Hy +QgBC/ajhahO4KiGaTTh2EsUzHDeVK8R1Mq44C53thw7zE1kLziZ4cUTIfRX3f5D0 +JYLwjpqbeTKQ7HIruzAhX6rIWacOGO+i69keG/YL9hqYH+gLRwA9zHLeXvVmTHgO +0mewHIzCWQFzJPLWbS7/Po0TABEBAAGJATwEGAEIACYCGwwWIQS4FRsRcDd4EJVR +TKe73/ySMGsRIQUCYQd/ygUJCbVRawAKCRC73/ySMGsRISZUB/wKAbO98uoSHgLS +C49tRH5M0nt6DAW412UJLi19PjPxl/rnQxlSsXrCOeTkRQShu1uq+FCH36+MY5KA +6g7aoQ6kht1M5xdFM1MKNgS0FXq15MweVkdeDE+O1SSV3hzfQrPgsVoFfWQKikOZ +7obUr7M092zaND/UipYDjFs0vxXDoMl7OSc+LJTkqaivtQ2W9+kyWPwot6hmv6l2 +HSlYsHJtMAdMSps2zhuviXB1T34/AQWEtIhwPLHQ2cJzzJ65YojqoJPiY/50Hh8I +95uiZ0I7m3QaCPevLFxDOp4818koqeM1kJ26WQu2xP5Bi8sb8pY3eUBx7fkp2WjT +cbARxFp/ +=E+He +-----END PGP PUBLIC KEY BLOCK----- diff --git a/core/pacman/libmakepkg-add-extra-buildflags-only-when-buildflags.patch b/core/pacman/libmakepkg-add-extra-buildflags-only-when-buildflags.patch deleted file mode 100644 index 365993571..000000000 --- a/core/pacman/libmakepkg-add-extra-buildflags-only-when-buildflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 42fe4864a0c8e2846007ffee532fe0cf4b321cdd Mon Sep 17 00:00:00 2001 -From: Allan McRae -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 ---- - 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" diff --git a/core/pacman/make-link-time-optimization-flags-configurable.patch b/core/pacman/make-link-time-optimization-flags-configurable.patch deleted file mode 100644 index 1406b7b49..000000000 --- a/core/pacman/make-link-time-optimization-flags-configurable.patch +++ /dev/null @@ -1,108 +0,0 @@ -From e1ce2351f5c00dd90104e0f4ce3bf176da28af08 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -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 ---- - 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 - diff --git a/core/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch b/core/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch deleted file mode 100644 index ca667d88f..000000000 --- a/core/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e37f7d8b6b4d2f9accf97eb96d0eacbddf2a1345 Mon Sep 17 00:00:00 2001 -From: Xiretza -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 ---- - 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"