patch ulam to include -Wno-error=parentheses flag for g++

1 files changed, 37 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7728d17da5d9..6fabceeba68c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Spencer Harmon
 
 pkgname="ulam-git"
-pkgver=4.0.1.r27.g8c517e58
+pkgver=4.0.1.r31.g7b346da2
 pkgrel=1
 epoch=
 pkgdesc="Github version of ulam compiler and MFM simulator"
@@ -10,15 +10,15 @@ url="https://github.com/elenasa/ULAM/wiki"
 license=('(L)GPL3')
 groups=()
 depends=('make'
-	'gcc'
-	'gcc49'
-	'binutils'
-	'perl'
-	'sdl'
-	'sdl_image'
-	'sdl_ttf'
-	'perl-crypt-openssl-rsa'
-	'perl-capture-tiny')
+  'gcc'
+  'gcc49'
+  'binutils'
+  'perl'
+  'sdl'
+  'sdl_image'
+  'sdl_ttf'
+  'perl-crypt-openssl-rsa'
+  'perl-capture-tiny')
 makedepends=('git')
 optdepends=('perl-splat-git: Support for the SPLAT programming language')
 checkdepends=()
@@ -31,42 +31,47 @@ options=('!buildflags' '!makeflags')
 install=
 changelog=
 source=("git://github.com/daveackley/MFM"
-        "git://github.com/daveackley/ULAM")
+  "git://github.com/daveackley/ULAM")
 noextract=()
 md5sums=('SKIP' 'SKIP')
 pkgver(){
-	cd $srcdir/ULAM
-	git describe --long | sed 's/v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $srcdir/ULAM
+  git describe --long | sed 's/v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-#	ensure build directory is correct
-	perl -0777 -i -pe 's/ifndef BUILDDIR\n\s(.+\n)endif\n/$1/' MFM/config/Makecommon.mk
+#  ensure build directory is correct
+  perl -0777 -i -pe 's/ifndef BUILDDIR\n\s(.+\n)endif\n/$1/' MFM/config/Makecommon.mk
 
-#	ensure path is correct in ulam.tmpl (note that latter ENV{PATH} uses bash expansion)
-#	this is effectively a workaround for perlsec, so proceed with caution
-	perl -0777 -i -pe 's/(delete.+\n)/$1\$ENV{PATH} = "$ENV{PATH}";\n/' ULAM/src/drivers/ulam/ulam.tmpl
+#  ensure path is correct in ulam.tmpl (note that latter ENV{PATH} uses bash expansion)
+#  this is effectively a workaround for perlsec, so proceed with caution
+  perl -0777 -i -pe 's/(delete.+\n)/$1\$ENV{PATH} = "$ENV{PATH}";\n/' ULAM/src/drivers/ulam/ulam.tmpl
 
-#	change non-portable uname flag from -i to -m
-	perl -0777 -i -pe 's/(uname -)i/$1m/' MFM/src/drivers/mfzrun/mfzrun.tmpl
+#  change non-portable uname flag from -i to -m
+  perl -0777 -i -pe 's/(uname -)i/$1m/' MFM/src/drivers/mfzrun/mfzrun.tmpl
+
+#  don't raise error for unnecessary parenthesis
+  perl -0777 -i -pe 's/(-Wno-error=unused-but-set-variable)/$1 -Wno-error=parentheses/g' ULAM/bin/ulam
+  perl -0777 -i -pe 's/(-Wno-error=unused-but-set-variable)/$1 -Wno-error=parentheses/g' ULAM/src/drivers/ulam/ulam.tmpl
 }
 
 build() {
-	make -C MFM NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9
+  make -C MFM NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9
+
+  make -C ULAM CXX=g++-4.9
+  
+  perl ULAM/share/perl/extractDistro.pl bin . "$srcdir/ulam" ulam
+  perl ULAM/share/perl/extractDistro.pl src . "$srcdir/ulam" ulam
+  make -C ulam CXX=g++-4.9 NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9
 
-	make -C ULAM CXX=g++-4.9
-	
-	perl ULAM/share/perl/extractDistro.pl bin . "$srcdir/ulam" ulam
-	perl ULAM/share/perl/extractDistro.pl src . "$srcdir/ulam" ulam
-	make -C ulam CXX=g++-4.9 NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9
 }
 
 package() {
-	make -C "$srcdir/ulam" DESTDIR="$pkgdir/" CXX=g++-4.9 NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9 install
+  make -C "$srcdir/ulam" DESTDIR="$pkgdir/" CXX=g++-4.9 NATIVE_GCC=gcc-4.9 NATIVE_GPP=g++-4.9 install
 
-	mkdir -p "$pkgdir/usr/bin"
-	for f in `ls "$pkgdir/usr/lib/ulam/ULAM/bin"`; \
-		do ln -sf "/usr/lib/ulam/ULAM/bin/$f" "$pkgdir/usr/bin/";done
-	for f in `ls "$pkgdir/usr/lib/ulam/MFM/bin"`; \
-		do ln -sf "/usr/lib/ulam/MFM/bin/$f" "$pkgdir/usr/bin/";done
+  mkdir -p "$pkgdir/usr/bin"
+  for f in `ls "$pkgdir/usr/lib/ulam/ULAM/bin"`; \
+    do ln -sf "/usr/lib/ulam/ULAM/bin/$f" "$pkgdir/usr/bin/";done
+  for f in `ls "$pkgdir/usr/lib/ulam/MFM/bin"`; \
+    do ln -sf "/usr/lib/ulam/MFM/bin/$f" "$pkgdir/usr/bin/";done
 }