Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

2 files changed, 37 insertions, 14 deletions

diff --git a/abs/core-testing/binutils/PKGBUILD b/abs/core-testing/binutils/PKGBUILD
index f958da6..9a8b925 100644
--- a/abs/core-testing/binutils/PKGBUILD
+++ b/abs/core-testing/binutils/PKGBUILD
@@ -1,45 +1,46 @@
-# $Id: PKGBUILD 2707 2008-06-12 14:03:09Z andyrtr $
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 19325 2008-11-20 11:47:00Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
-# compile always twice: first binutils, then gcc, then binutils again
+# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.18
-pkgrel=17
-_date=20080610
+pkgver=2.19
+pkgrel=1
+_date=20081119
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://sources.redhat.com/binutils"
 license=('GPL')
 groups=('base')
 options=('!libtool' '!distcc' '!ccache')
-depends=('glibc>=2.8-1')
-makedepends=('texinfo>=4.12-2')
+depends=('glibc>=2.9-1' 'texinfo>=4.12-3')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('9847b4141a1c99558cfd88dd65182566')
+md5sums=('4a49694b08ef0e5931dba4813326d062')
+install=binutils.install
 
 build() {
   # for cvs checkout
 #  mkdir ${startdir}/src/${pkgname}-${_date}
 #  cd ${startdir}/src/${pkgname}-${_date}
-#  export _TAG=binutils-2_18-branch
+#  export _TAG=binutils-2_19-branch
 #  export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
 #  cvs -z9 co -r $_TAG binutils || return 1
-#  cd src && tar -cvjf ../binutils-2.18_${_date}.tar.bz2 *
+#  cd src && tar -cvjf ../../../binutils-2.19_${_date}.tar.bz2 *
 #  return 1
 
   cd ${startdir}/src
-  autoconf
 
   mkdir build
   cd build
 
   CC="gcc -L`pwd`/bfd/.libs/"
   if [ "${CARCH}" = "x86_64" ]; then
-    ../configure --prefix=/usr --enable-shared --enable-64-bit-bfd --disable-multilib 
+    ../configure --prefix=/usr --infodir=/usr/share/info --enable-shared --enable-64-bit-bfd --disable-multilib 
   else
-    ../configure --prefix=/usr --enable-shared
+    ../configure --prefix=/usr --infodir=/usr/share/info --enable-shared
   fi
+  # fix info files install path
+  sed -i -e "s:infodir \= \/usr\/share:infodir \= ${pkgdir}\/usr\/share:" ${srcdir}/build/Makefile || return 1
 
   # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
   make configure-host || return 1
@@ -64,4 +65,6 @@ build() {
   # Remove these symlinks, with binutils prereleases they are not ABI stable.
   # Programs should compile static to the .a file.
   rm -f ${startdir}/pkg/usr/lib/lib{bfd,opcodes}.so
+
+  rm -f ${pkgdir}/usr/share/info/dir
 }
diff --git a/abs/core-testing/binutils/binutils.install b/abs/core-testing/binutils/binutils.install
new file mode 100644
index 0000000..a1e762a
--- /dev/null
+++ b/abs/core-testing/binutils/binutils.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: