git » sdcc.git » commit 6864e4a

Fix build with glibc 2.20 (r9106 upstream)

author Evangelos Foutras
2015-06-07 16:30:02 UTC
committer Evangelos Foutras
2015-06-07 16:30:02 UTC
parent 2dfff395125e517d983eecd2ee302fd8d0d303e7

Fix build with glibc 2.20 (r9106 upstream)

PKGBUILD +8 -2
glibc220-build-fix.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index 6669172..90b0e64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,12 +12,18 @@ makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
 optdepends=('python')
 url="http://sdcc.sourceforge.net/"
 options=(!strip  staticlibs)
-source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('92db2ea2526f6cef412547bb1e759a48')
+source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2
+        glibc220-build-fix.patch)
+md5sums=('92db2ea2526f6cef412547bb1e759a48'
+         'de3be2a60baaafbdbfe5efaaacbb3028')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure
+
+  # Fix build with glibc 2.20
+  # http://sourceforge.net/p/sdcc/bugs/2303/
+  patch -Np0 -i ../glibc220-build-fix.patch
 }
 
 build() {
diff --git a/glibc220-build-fix.patch b/glibc220-build-fix.patch
new file mode 100644
index 0000000..72c3ea4
--- /dev/null
+++ b/glibc220-build-fix.patch
@@ -0,0 +1,13 @@
+Index: sdas/linksrc/Makefile.in
+===================================================================
+--- sdas/linksrc/Makefile.in	(revision 9105)
++++ sdas/linksrc/Makefile.in	(revision 9106)
+@@ -35,7 +35,7 @@
+ VPATH           = @srcdir@
+ 
+ CPPFLAGS        = @CPPFLAGS@ -I.. -I$(srcdir)/..
+-CFLAGS          = @CFLAGS@ @WALL_FLAG@ -DINDEXLIB -DUNIX -I. -I$(srcdir)
++CFLAGS          = @CFLAGS@ @WALL_FLAG@ -DINDEXLIB -DUNIX -I. -I$(srcdir) --std=c99
+ LDFLAGS         = @LDFLAGS@
+ 
+ OBJDIR = obj