|
| 1 | +diff --git a/etc/makepkg_mingw.conf b/etc/makepkg_mingw.conf |
| 2 | +--- a/etc/makepkg_mingw.conf |
| 3 | ++++ b/etc/makepkg_mingw.conf |
| 4 | +@@ -34,15 +34,17 @@ |
| 5 | + # |
| 6 | + |
| 7 | + if [[ "$MSYSTEM" == "MINGW64" ]]; then |
| 8 | +- CARCH="x86_64" |
| 9 | ++ CARCH="aarch64" |
| 10 | + CHOST="x86_64-w64-mingw32" |
| 11 | + MINGW_CHOST="x86_64-w64-mingw32" |
| 12 | + MINGW_PREFIX="/mingw64" |
| 13 | + MINGW_PACKAGE_PREFIX="mingw-w64-x86_64" |
| 14 | +- CC="gcc" |
| 15 | +- CXX="g++" |
| 16 | ++ CC="aarch64-w64-mingw32-gcc" |
| 17 | ++ CXX="aarch64-w64-mingw32-g++" |
| 18 | ++ STRIP="aarch64-w64-mingw32-strip" |
| 19 | ++ OBJDUMP="aarch64-w64-mingw32-objdump" |
| 20 | + CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1" |
| 21 | +- CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" |
| 22 | ++ CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" |
| 23 | + CXXFLAGS="$CFLAGS" |
| 24 | + LDFLAGS="" |
| 25 | + elif [[ "$MSYSTEM" == "MINGW32" ]]; then |
| 26 | +--- /etc/pacman.conf |
| 27 | ++++ /etc/pacman.conf |
| 28 | +@@ -21,7 +21,7 @@ |
| 29 | + Architecture = auto |
| 30 | + |
| 31 | + # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup |
| 32 | +-#IgnorePkg = |
| 33 | ++IgnorePkg = pacman |
| 34 | + #IgnoreGroup = |
| 35 | + |
| 36 | + #NoUpgrade = |
| 37 | +diff --git a/etc/profile b/etc/profile |
| 38 | +--- a/etc/profile |
| 39 | ++++ b/etc/profile |
| 40 | +@@ -49,7 +49,7 @@ |
| 41 | + case "${MSYSTEM}" in |
| 42 | + MINGW*|CLANG*|UCRT*) |
| 43 | + MINGW_MOUNT_POINT="${MINGW_PREFIX}" |
| 44 | +- PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}" |
| 45 | ++ PATH="/opt/bin:${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}" |
| 46 | + PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig" |
| 47 | + PKG_CONFIG_SYSTEM_INCLUDE_PATH="${MINGW_MOUNT_POINT}/include" |
| 48 | + PKG_CONFIG_SYSTEM_LIBRARY_PATH="${MINGW_MOUNT_POINT}/lib" |
| 49 | +diff --git a/usr/share/makepkg/tidy/strip.sh b/usr/share/makepkg/tidy/strip.sh |
| 50 | +--- a/usr/share/makepkg/tidy/strip.sh |
| 51 | ++++ b/usr/share/makepkg/tidy/strip.sh |
| 52 | +@@ -85,7 +85,7 @@ |
| 53 | + strip_file(){ |
| 54 | + local binary=$1; shift |
| 55 | + local tempfile=$(mktemp "$binary.XXXXXX") |
| 56 | +- if strip "$@" "$binary" -o "$tempfile"; then |
| 57 | ++ if $STRIP "$@" "$binary" -o "$tempfile"; then |
| 58 | + cat "$tempfile" > "$binary" |
| 59 | + fi |
| 60 | + rm -f "$tempfile" |
| 61 | +@@ -95,7 +95,7 @@ |
| 62 | + local binary=$1; |
| 63 | + |
| 64 | + local tempfile=$(mktemp "$binary.XXXXXX") |
| 65 | +- if strip -R .gnu.lto_* -R .gnu.debuglto_* -N __gnu_lto_v1 "$binary" -o "$tempfile"; then |
| 66 | ++ if $STRIP -R .gnu.lto_* -R .gnu.debuglto_* -N __gnu_lto_v1 "$binary" -o "$tempfile"; then |
| 67 | + cat "$tempfile" > "$binary" |
| 68 | + fi |
| 69 | + rm -f "$tempfile" |
| 70 | +@@ -176,7 +176,7 @@ |
| 71 | + case "${binary##*/}" in |
| 72 | + *.dll|*.exe|*.sfx|*.so|*.so.[0-9]*|*.oct|*.cmxs) ;; |
| 73 | + # make sure this isn't some oddly named DLL |
| 74 | +- *) if LANG=en_US.UTF-8 LC_ALL=C objdump -f "${binary}" | grep -Eq '^start address 0x(0000000[01])?00401[0-9a-e][0-9a-e]0' |
| 75 | ++ *) if LANG=en_US.UTF-8 LC_ALL=C $OBJDUMP -f "${binary}" | grep -Eq '^start address 0x(0000000[01])?00401[0-9a-e][0-9a-e]0' |
| 76 | + then |
| 77 | + mv "${binary}" "${binary}.exe" |
| 78 | + binary+=.exe |
0 commit comments