pacman: export CC and CXX variables explicitly

pacman/0021-export-cc-cxx.patch

@@ -0,0 +1,19 @@
+--- pacman-5.2.2/scripts/libmakepkg/buildenv.sh.in.orig	2021-05-15 07:20:51.021291800 +0100
++++ pacman-5.2.2/scripts/libmakepkg/buildenv.sh.in	2021-05-15 07:52:13.014867100 +0100
+@@ -36,5 +36,5 @@
+ 	done
+
+ 	# ensure all necessary build variables are exported
+-	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST
++	export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST
+ }
+--- pacman-5.2.2/scripts/libmakepkg/buildenv/buildflags.sh.in.orig	2021-05-15 07:55:29.592543800 +0100
++++ pacman-5.2.2/scripts/libmakepkg/buildenv/buildflags.sh.in	2021-05-15 07:55:42.773495200 +0100
+@@ -30,6 +30,6 @@
+
+ buildenv_buildflags() {
+ 	if check_option "buildflags" "n"; then
+-		unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
++		unset CC CXX CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
+ 	fi
+ }

pacman/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=5.2.2
-pkgrel=22
+pkgrel=23
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -59,13 +59,14 @@ source=(https://sources.archlinux.org/other/pacman/${pkgname}-${pkgver}.tar.gz
         "0017-excise-sudo.patch"
         "0018-use-msys-tools.patch"
         "0019-doxyfile-in-missing.patch"
-        "0020-fix-wrong-files-sig-clean.patch")
+        "0020-fix-wrong-files-sig-clean.patch"
+        "0021-export-cc-cxx.patch")
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <[email protected]>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <[email protected]>
 sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'f5a84c5642d57044ddb40387822bfcb01bdbdcd885b46bc93d116aaf0e5741a6'
-            '822af13248f04690377cd193370f33ac2f00a41234ead9cf3b7e5d5aba8bd0c5'
-            'e533985757a4fef1e72c3349eb62aebbd14c1d457faf10306218cf637b207030'
+            '178ff34e13f7d558a4410f909667c07faeaf7a83b15b00e7db342c0796675733'
+            'b9ad2fb4b0e686b96db0a50d411f4d9344ec8950f50906fb502272037246e4b8'
             '2bd27c3fc5443b367e5025c9b9a35670b02202e48e92eead90755fef8d08fa83'
             '2e2dde573b971011abad5340cb2cd5a4b9a0e8470a2ed94d7a969525e0bed0c1'
             '24ea2c8dca37847e04894ebfd05d1cf5df49dc0c8089f5581c99caa19b77a7ef'
@@ -85,7 +86,8 @@ sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             '8346a5799be41bd3524fa6fdc57b6175d9d6a00b366f99bd5cd7fa3d43d0ae98'
             '7f60108a372718cfec5d883167a33983be7c5df33fc48bfc21f664449ac7a0a4'
             '43eb9548ddff92fb08c0c7636c4978541ff225e220bf4ba6512118cf75e76b07'
-            '876d8d726ed6cc069f947daa1c3d6ffe07ee51e3019dd40f6b77576e8900d1da')
+            '876d8d726ed6cc069f947daa1c3d6ffe07ee51e3019dd40f6b77576e8900d1da'
+            'b766c7d7fc12f0d2b00d853cca8b15add7170e5e33fd03434ab991ddaa1de7af')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -109,13 +111,15 @@ prepare() {
   patch -p1 -i ${srcdir}/0019-doxyfile-in-missing.patch
   # https://git.archlinux.org/pacman.git/commit/src/pacman/sync.c?id=05aefb8f82d856626598ef6a3f49ff8d5f623bf5
   patch -p1 -i ${srcdir}/0020-fix-wrong-files-sig-clean.patch
+  patch -p1 -i ${srcdir}/0021-export-cc-cxx.patch
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
 
   LDFLAGS+=" -static-libgcc" \
-  meson build-${CARCH} \
+  meson . ../${pkgname}-${pkgver} \
     --buildtype=plain \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -130,17 +134,17 @@ build() {
     -Dpkg-ext=.pkg.tar.xz \
     -Dscriptlet-shell=/usr/bin/bash
 
-  meson compile -C build-${CARCH}
+  meson compile
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  meson test -C build-${CARCH}
+  cd ${srcdir}/build-${CARCH}
+  meson test
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  DESTDIR=${pkgdir} meson install -C build-${CARCH}
+  cd ${srcdir}/build-${CARCH}
+  DESTDIR=${pkgdir} meson install
 
   # install Arch specific stuff
   install -dm755 ${pkgdir}/etc

pacman/makepkg.conf

@@ -45,6 +45,8 @@ CHOST="@CHOST@"
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
+CC=gcc
+CXX=g++
 CPPFLAGS=
 CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe"
 CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe"

pacman/makepkg_mingw.conf

@@ -46,6 +46,8 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/mingw64"
   MINGW_PACKAGE_PREFIX="mingw-w64-x86_64"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
@@ -56,6 +58,8 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
   MINGW_CHOST="i686-w64-mingw32"
   MINGW_PREFIX="/mingw32"
   MINGW_PACKAGE_PREFIX="mingw-w64-i686"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
@@ -66,6 +70,8 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/clang64"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
@@ -76,6 +82,8 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then
   MINGW_CHOST="i686-w64-mingw32"
   MINGW_PREFIX="/clang32"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-i686"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
@@ -86,6 +94,8 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
   MINGW_CHOST="aarch64-w64-mingw32"
   MINGW_PREFIX="/clangarm64"
   MINGW_PACKAGE_PREFIX="mingw-w64-clang-aarch64"
+  CC="clang"
+  CXX="clang++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-O2 -pipe"
   CXXFLAGS="-O2 -pipe"
@@ -96,6 +106,8 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
   MINGW_CHOST="x86_64-w64-mingw32"
   MINGW_PREFIX="/ucrt64"
   MINGW_PACKAGE_PREFIX="mingw-w64-ucrt-x86_64"
+  CC="gcc"
+  CXX="g++"
   CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
   CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
   CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"