Skip to content

Commit

Permalink
gcc: Fix MSYS gcc spec to handle default-manifest.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Oct 26, 2014
1 parent 556a3fa commit 9b82b17
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions gcc/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
pkgver=4.9.1
pkgrel=2
pkgrel=3
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
groups=('msys2-devel')
license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
makedepends=('binutils>=2.23' 'mpc-devel' 'cloog-devel' 'gmp-devel'
'mpfr-devel' 'mpc-devel' 'isl-devel' 'zlib-devel')
'mpfr-devel' 'mpc-devel' 'isl-devel' 'zlib-devel' 'windows-default-manifest')

options=('!emptydirs')
source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
Expand Down Expand Up @@ -58,7 +58,7 @@ md5sums=('fddf71348546af523353bd43d34919c1'
'7b7021f61fbe883962458255cf2d4fea'
'0cad08f12b27fab33264de04bb3a58b1'
'8939d9e1a18a1181bbb95da8efb8e98f'
'5e7bd7d99e7a701979abeb59b898fa6d'
'0d85279666763cbc20b5aa15219f195a'
'a294820ed2717ced56fddaa2bd743901')

prepare() {
Expand Down Expand Up @@ -211,7 +211,7 @@ package_gcc-libs()
package_gcc()
{
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'mpc' 'cloog' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime')
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'mpc' 'cloog' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime' 'windows-default-manifest')
options=('staticlibs')
install=gcc.install

Expand Down
3 changes: 2 additions & 1 deletion gcc/gcc-4.8.0-msys2-spec.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Naur gcc-4.8.0-cygwin/gcc/config/i386/msys.h gcc-4.8.0/gcc/config/i386/msys.h
--- gcc-4.8.0-cygwin/gcc/config/i386/msys.h 1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.8.0/gcc/config/i386/msys.h 2013-04-16 16:54:04.264648400 +0000
@@ -0,0 +1,156 @@
@@ -0,0 +1,157 @@
+/* Operating system specific defines to be used when targeting GCC for
+ hosting on Windows32, using a Unix style C library and tools.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
Expand Down Expand Up @@ -51,6 +51,7 @@ diff -Naur gcc-4.8.0-cygwin/gcc/config/i386/msys.h gcc-4.8.0/gcc/config/i386/msy
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC \
+ "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s}\
+ %{!shared:%:if-exists(default-manifest.o%s)}\
+ crtend.o%s"
+
+/* Normally, -lgcc is not needed since everything in it is in the DLL, but we
Expand Down

0 comments on commit 9b82b17

Please sign in to comment.