Tue Jul 24 00:01:46 UTC 2012

2 files changed, 20 insertions, 41 deletions

diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index b6d795076..64781e231 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142183 2011-11-05 22:42:53Z allan $
+# $Id: PKGBUILD 163938 2012-07-22 12:56:35Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=flex
-pkgver=2.5.35
-pkgrel=5
+pkgver=2.5.36
+pkgrel=1
 pkgdesc="A tool for generating text-scanning programs"
 arch=('i686' 'x86_64')
 url="http://flex.sourceforge.net"
@@ -12,48 +12,33 @@ license=('custom')
 groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
 install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 
-        flex-2.5.35-gcc44.patch
-        flex-2.5.35-hardening.patch
-        flex-2.5.35-missing-prototypes.patch
-        flex-2.5.35-sign.patch
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
         lex.sh)
-md5sums=('10714e50cea54dc7a227e3eddcd44d57'
-         'e4444ef5c07db71a43280be74139bdea'
-         'de952b3ed7cc074bc8c3e6ab73634048'
-         '6b83f56b1b654c6a321cdc530a3ec68d'
-         'd87fd9e9762ba7e230d516bdcf1c8c6f'
+md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5'
          'f725259ec23a9e87ee29e2ef82eda9a5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
-
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr
   make
 }
 
 check() {
   cd $srcdir/$pkgname-$pkgver
+  
+  # these tests used features removed in bison-2.6
+  sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
+
   make check
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  make prefix=$pkgdir/usr \
-    mandir=$pkgdir/usr/share/man \
-    infodir=$pkgdir/usr/share/info \
-    install
+  make DESTDIR=$pkgdir install
   install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
 
   install -Dm644 COPYING \
   	$pkgdir/usr/share/licenses/$pkgname/license.txt
-  	
 }
 
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 27746c777..d45cc0f42 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163010 2012-07-05 13:48:46Z allan $
+# $Id: PKGBUILD 163961 2012-07-23 02:59:09Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.7.1
-pkgrel=4
-#_snapshot=4.7-20120505
+pkgrel=5
+_snapshot=4.7-20120721
 _libstdcppmanver=20120605		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -16,19 +16,17 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
 	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch
-        gcc-4.7.1-libgo-mksysinfo.patch)
-md5sums=('933e6f15f51c031060af64a9e14149ff'
+	gcc-4.7.1-libgo-write.patch)
+md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
          '767c62f9a047c4434f2345decf1d0819'
          'ced48436c1b3c981d721a829f1094de1'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c'
-         '8e847244dba042d0aa3297713edaf70c')
+         'df82dd175ac566c8a6d46b11ac21f14c')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -56,9 +54,6 @@ build() {
   # bug to file...
   patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
 
-  # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
-  patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch
-
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -158,8 +153,7 @@ package_gcc()
   rm $pkgdir/usr/share/man/man3/ffi*
 
   # many packages require these symlinks
-  #install -dm755 ${pkgdir}/lib
-  #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp
+  ln -s /usr/bin/cpp ${pkgdir}/usr/lib/cpp
   ln -s gcc ${pkgdir}/usr/bin/cc
 
   # POSIX conformance launcher scripts for c89 and c99