2016-02-21 02:22 UTC+0100 Viktor Szakats (vszakats users.noreply.gith…

…ub.com) [ci skip]

  * package/mpkg_win_dl.sh
    ! apply hack for MSYS2/mingw-w64 to avoid errors in linked binaries
      See the URLs in the patch for more info.

ChangeLog.txt

@@ -5,6 +5,11 @@
      git log --pretty=medium --no-merges --date=iso --abbrev-commit HEAD~50..HEAD
    See license at the end of file. */
 
+2016-02-21 02:22 UTC+0100 Viktor Szakats (vszakats users.noreply.github.com)
+  * package/mpkg_win_dl.sh
+    ! apply hack for MSYS2/mingw-w64 to avoid errors in linked binaries
+      See the URLs in the patch for more info.
+
 2016-02-21 00:56 UTC+0100 Viktor Szakats (vszakats users.noreply.github.com)
   * utils/hbmk2/hbmk2.prg
     ! use LF EOL for -bldhead header. It's now consistent with -vcshead

package/mpkg_win_dl.sh

@@ -41,6 +41,17 @@ set -e
       openssl dgst -sha256 pack.bin | grep -q ec28b6640ad4f183be7afcd6e9c5eabb24b89729ca3fec7618755555b5d70c19
       # Will unpack into "./mingw64"
       7z x -y pack.bin > /dev/null
+   else
+      # Bad hack to avoid duplicate manifests being linked into slightly
+      # "off" binaries, that are in turn impossible to UPX.
+      #    https://github.com/Alexpux/MSYS2-packages/issues/454
+      #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69880
+      for file in \
+         /usr/lib/default-manifest.o \
+         /mingw32/i686-w64-mingw32/lib/default-manifest.o \
+         /mingw64/x86_64-w64-mingw32/lib/default-manifest.o ; do
+         mv "${file}" "${file}-ORI"
+      done
    fi
 )