summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxantares2015-06-13 09:53:56 +0200
committerxantares2015-06-13 09:53:56 +0200
commit8e5246752b67ee56208a714f3fb70ffa8ba56f33 (patch)
tree326bce2949ec3524931cc8118ad1016bc49d6bd9
parent8b3302621209448bb6ec9d1355bf2339229e4f7b (diff)
downloadaur-8e5246752b67ee56208a714f3fb70ffa8ba56f33.tar.gz
fix gcc5 build
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
-rw-r--r--patch-gcc_cp_cfns.h22
3 files changed, 29 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc553d6093e..f385a658311 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,11 +23,13 @@ pkgbase = psp-gcc
source = ftp://ftp.gmplib.org/pub/gmp-5.1.3/gmp-5.1.3.tar.bz2
source = http://www.multiprecision.org/mpc/download/mpc-1.0.2.tar.gz
source = http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.bz2
+ source = patch-gcc_cp_cfns.h
md5sums = b407a3d1480c11667f293bfb1f17d1a4
md5sums = fde0c20f56e608715ec13d5d8b8c8e59
md5sums = a082867cbca5e898371a97bb27b31fea
md5sums = 68fadff3358fb3e7976c7a398a0af4c3
md5sums = ee2c3ac63bf0c2359bf08fc3ee094c19
+ md5sums = cc8bac293c0f0c6e127e7d242237f875
pkgname = psp-gcc
diff --git a/PKGBUILD b/PKGBUILD
index cd21fcb1a07..2c6a42ce5d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,3 @@
-# Maintainer: xantares <xantares09 at hotmail dot com>
-
pkgname=psp-gcc
pkgver=4.6.4
pkgrel=1
@@ -16,18 +14,21 @@ source=("http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2"
"gcc-$pkgver-PSP.patch"
"ftp://ftp.gmplib.org/pub/gmp-5.1.3/gmp-5.1.3.tar.bz2"
"http://www.multiprecision.org/mpc/download/mpc-1.0.2.tar.gz"
- "http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.bz2")
+ "http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.bz2"
+ "patch-gcc_cp_cfns.h")
md5sums=('b407a3d1480c11667f293bfb1f17d1a4'
'fde0c20f56e608715ec13d5d8b8c8e59'
'a082867cbca5e898371a97bb27b31fea'
'68fadff3358fb3e7976c7a398a0af4c3'
- 'ee2c3ac63bf0c2359bf08fc3ee094c19')
+ 'ee2c3ac63bf0c2359bf08fc3ee094c19'
+ 'cc8bac293c0f0c6e127e7d242237f875')
prepare ()
{
cd "$srcdir/gcc-$pkgver"
rm -f gcc/config/mips/allegrex.md gcc/config/mips/psp.h gcc/config/mips/t-allegrex
patch -p1 -i "$srcdir"/gcc-$pkgver-PSP.patch
+ patch -p0 -i "$srcdir"/patch-gcc_cp_cfns.h
ln -sf "$srcdir"/gmp-5.1.3 gmp
ln -sf "$srcdir"/mpc-1.0.2 mpc
ln -sf "$srcdir"/mpfr-3.1.2 mpfr
diff --git a/patch-gcc_cp_cfns.h b/patch-gcc_cp_cfns.h
new file mode 100644
index 00000000000..79d3dcf3a9f
--- /dev/null
+++ b/patch-gcc_cp_cfns.h
@@ -0,0 +1,22 @@
+--- gcc/cp/cfns.h.orig 2015-02-13 08:27:46.000000000 +0200
++++ gcc/cp/cfns.h 2015-02-13 10:23:53.000000000 +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 */
+@@ -96,7 +99,7 @@
+ 400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+ 400, 400, 400, 400, 400, 400, 400
+ };
+- register int hval = len;
++ register int hval = (int)len;
+
+ switch (hval)
+ {
+