summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebRmv2015-06-07 10:13:10 +0200
committerSebRmv2015-06-07 10:13:36 +0200
commit0e3e71df45335c240b33be512cc8ef176afabf22 (patch)
tree388b6ef17dc0f1d76f2b74424958a23b220fb85c
parent3aec1372b778b297e6421eb35fdb2cdf9841e1e5 (diff)
downloadaur-0e3e71df45335c240b33be512cc8ef176afabf22.tar.gz
Fix compilation.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--cfns.h.patch12
3 files changed, 19 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c79dfc3c713..3a94b5f4b50a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = m68k-atari-mint-gcc
pkgdesc = The GNU Compiler Collection for the Motorola M68000 architecture
pkgver = 4.6.4
- pkgrel = 5
+ pkgrel = 6
url = http://www.gnu.org/software/gcc/
arch = i686
arch = x86_64
@@ -24,8 +24,10 @@ pkgbase = m68k-atari-mint-gcc
options = staticlibs
source = ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2
source = gcc-4.6.4-mint-20130415.patch.bz2
+ source = cfns.h.patch
sha1sums = 63933a8a5cf725626585dbba993c8b0f6db1335d
sha1sums = bd2e88f2b862cc404f47144fb67375b1fe17291b
+ sha1sums = 0c9f81040e112c27434fbb11c7214fb799e3507d
pkgname = m68k-atari-mint-gcc
diff --git a/PKGBUILD b/PKGBUILD
index d325461769a3..4a767a114a37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=m68k-atari-mint-gcc
_pkgname=gcc
_target="m68k-atari-mint"
pkgver=4.6.4
-pkgrel=5
+pkgrel=6
pkgdesc="The GNU Compiler Collection for the Motorola M68000 architecture"
url="http://www.gnu.org/software/gcc/"
arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ replaces=('cross-m68k-atari-mint-gcc')
provides=('m68k-atari-mint-gcc-core')
conflicts=('cross-m68k-atari-mint-gcc' 'cross-m68k-atari-mint-gcc-core' 'm68k-atari-mint-gcc-core')
options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip' 'staticlibs')
-source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2" "gcc-4.6.4-mint-20130415.patch.bz2")
-sha1sums=('63933a8a5cf725626585dbba993c8b0f6db1335d' 'bd2e88f2b862cc404f47144fb67375b1fe17291b')
+source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2" "gcc-4.6.4-mint-20130415.patch.bz2" "cfns.h.patch")
+sha1sums=('63933a8a5cf725626585dbba993c8b0f6db1335d' 'bd2e88f2b862cc404f47144fb67375b1fe17291b' '0c9f81040e112c27434fbb11c7214fb799e3507d')
_sysroot="/usr/lib/${_target}"
@@ -24,6 +24,7 @@ prepare() {
cd ${srcdir}/${_pkgname}-${pkgver}
patch -Np1 < ../gcc-4.6.4-mint-20130415.patch
+ patch -p0 < ../cfns.h.patch
}
build() {
diff --git a/cfns.h.patch b/cfns.h.patch
new file mode 100644
index 000000000000..780b70d703b8
--- /dev/null
+++ b/cfns.h.patch
@@ -0,0 +1,12 @@
+--- gcc/cp/cfns.h.orig 2015-06-07 09:59:30.145650843 +0200
++++ gcc/cp/cfns.h 2015-06-07 09:59:59.748984674 +0200
+@@ -53,6 +53,9 @@
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__))
++#endif
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */