arch patches

bin/base/mkchroot.in

@@ -93,7 +93,7 @@ done
 unshare --mount basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
     "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
-printf '%s.UTF-8 UTF-8\n' C en_US de_DE > "$working_dir/etc/locale.gen"
+printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 printf 'LANG=C.UTF-8\n' > "$working_dir/etc/locale.conf"
 # printf 'KEYMAP=en\n' > "$working_dir/etc/vconsole.conf"
 printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"

bin/pkg/diffpkg.in

@@ -240,6 +240,8 @@ diff_pkgs() {
     fi
 }
 
+shopt -s extglob
+
 fetch_pkg() {
     local pkg pkgdest pkgurl
     case $1 in
@@ -288,6 +290,8 @@ fetch_pkg() {
     echo "$pkgdest"
 }
 
+shopt -u extglob
+
 if (( $# < 2 )); then
     if [[ ! -f PKGBUILD ]]; then
         die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."

bin/pkg/find-libdeps.in

@@ -50,6 +50,8 @@ else
     pushd "$WORKDIR" >/dev/null
 fi
 
+shopt -s extglob
+
 process_sofile() {
     # extract the library name: libfoo.so
     shopt -s extglob nullglob
@@ -67,6 +69,8 @@ process_sofile() {
     fi
 }
 
+shopt -u extglob
+
 case $script_mode in
     deps) find_args=(-perm -u+x);;
     provides) find_args=(-name '*.so*');;

data/pacman/makepkg.conf

@@ -46,13 +46,13 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
 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"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT

lib/pkg/deploy.sh

@@ -2,6 +2,8 @@
 
 #{{{ functions
 
+shopt -s extglob
+
 find_cached_pkgfile() {
     local searchdirs=("$PKGDEST" "$PWD") results=()
     local pkg="$1"
@@ -25,6 +27,8 @@ find_cached_pkgfile() {
     esac
 }
 
+shopt -u extglob
+
 get_pkgbasename() {
     local name="$1"
     local rm_pkg=${name%.pkg.tar*}

lib/pkg/diff.sh

@@ -12,6 +12,8 @@ pkgver_equal() {
     fi
 }
 
+shopt -s extglob
+
 find_cached_package() {
     local searchdirs=("$PWD" "$PKGDEST") results=()
     local targetname=$1 targetver=$2 targetarch=$3
@@ -68,4 +70,6 @@ find_cached_package() {
     esac
 }
 
+shopt -u extglob
+
 #}}}