Skip to content

Commit

Permalink
Revert "gcc: backport some more fixes"
Browse files Browse the repository at this point in the history
This reverts commit 994a815.
  • Loading branch information
lazka authored and mingwandroid committed Apr 8, 2021
1 parent 436f3ef commit 48d070a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 49 deletions.
40 changes: 0 additions & 40 deletions mingw-w64-gcc/0202-backport-2939b35.patch

This file was deleted.

12 changes: 3 additions & 9 deletions mingw-w64-gcc/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pkgver=10.2.0
#_majorver=${pkgver:0:1}
#_sourcedir=${_realname}-${_majorver}-${_snapshot}
_sourcedir=${_realname}-${pkgver}
pkgrel=8
pkgrel=7
pkgdesc="GCC for the MinGW-w64"
arch=('any')
url="https://gcc.gnu.org"
Expand Down Expand Up @@ -72,8 +72,7 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver%%+*}/${_realname}-${p
0150-gcc-10.2.0-libgcc-ldflags.patch
0160-libbacktrace-seh.patch
0200-backport-7fc0f78.patch
0201-backport-49a714e.patch
0202-backport-2939b35.patch)
0201-backport-49a714e.patch)
sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'SKIP'
'bce81824fc89e5e62cca350de4c17a27e27a18a1a1ad5ca3492aec1fc5af3234'
Expand All @@ -99,8 +98,7 @@ sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'7f0b4e45d933e18c9d8bd2afcd83e4f52e97e2e25dd41bfa0cba755c70e591c7'
'88c1d65e763e631ad49f9a077ed631f4acac9ef4732e2818ccddaefc883b1811'
'90b0f1aae2e2f9d75520569e8fbb31a9bac507136dd103a966f063d28e2094b8'
'6bcaf2846ceeafa87912b30ed3e573d75b35bbeafebdaf675e2318b9b0058fbb'
'319b1ffe9dbede0578ffa4fd78fe803bf40ed1e0bc52251fdaaadd869f0dbf2a')
'6bcaf2846ceeafa87912b30ed3e573d75b35bbeafebdaf675e2318b9b0058fbb')
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # [email protected]
86CFFCA918CF3AF47147588051E8B148A9999C34 # [email protected]
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # [email protected]
Expand Down Expand Up @@ -174,10 +172,6 @@ prepare() {
apply_patch_with_msg \
0201-backport-49a714e.patch

# https://github.com/msys2/MINGW-packages/issues/8079
apply_patch_with_msg \
0202-backport-2939b35.patch

# do not expect ${prefix}/mingw symlink - this should be superceded by
# 0005-Windows-Don-t-ignore-native-system-header-dir.patch .. but isn't!
sed -i 's/${prefix}\/mingw\//${prefix}\//g' configure
Expand Down

0 comments on commit 48d070a

Please sign in to comment.