Mirrored core's changes from 2.26.1-1 to 2.27-1

3 files changed, 18 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96881133c420..0e1c945609d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 15 02:47:09 UTC 2016
+# Wed Mar  8 20:15:41 UTC 2017
 pkgbase = binutils-git
 	pkgdesc = A set of programs to assemble and manipulate binary and object files (git master developmental version)
-	pkgver = 2.26.r87884.50c1cbe
+	pkgver = 2.28.r89832.15c22686d0
 	pkgrel = 1
 	url = http://www.gnu.org/software/binutils/
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = binutils-git
 	checkdepends = dejagnu
 	checkdepends = bc
 	makedepends = git
-	depends = glibc>=2.23
+	depends = glibc>=2.24
 	depends = zlib
 	provides = binutils
 	conflicts = binutils-multilib
diff --git a/PKGBUILD b/PKGBUILD
index 801e32e80f33..46bad26bf2ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,24 +5,21 @@
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
-# build from head of release branch as bug fix releases are rare
-
 # Modifications to Use Git Master Source
 # ======================================
 # Maintainer: James Harvey <jamespharvey20@gmail.com>
-#    * This PKGFILE as closely as possible matches core's binutils 2.25.1-3
-#    * Core's binutils 2.25.1-3 binutils-e9c1bdad.patch is omitted
-#       * It is git commit e9c1bdad
+#    * This PKGFILE as closely as possible matches core's binutils 2.27-1
 #    * All namcap warnings and errors are identical, other than:
 #       * Warning zlib is no longer a dependency
 #          * Siding with caution, leaving it as a dependency
 #       * Warning libraries libopcodes and libbfd are uninstalled dependencies
-#          * It's hardcoded to look for a version in format 2.25.51.20150705.so, rather than 2.25.r842222.533edc1
+#          * This is referencing itself, and the -git version is not installed in a chroot build because binutils is already installed, and it defaults to 'no' for the conflict
+#          * It's hardcoded to look for a version in format 2.28.51.20170308.so, rather than 2.28.r89832.15c22686d0
 #             * .51 is binutils' designation for their post-release development branch
 
 pkgname=binutils-git
 _pkgname=binutils-gdb
-pkgver=2.26.r87884.50c1cbe
+pkgver=2.28.r89832.15c22686d0
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files (git master developmental version)"
 arch=('i686' 'x86_64')
@@ -30,7 +27,7 @@ url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 provides='binutils=${pkgver}'
 groups=('base-devel')
-depends=('glibc>=2.23' 'zlib')
+depends=('glibc>=2.24' 'zlib')
 makedepends=('git')
 checkdepends=('dejagnu' 'bc')
 provides=('binutils')
@@ -57,13 +54,19 @@ prepare() {
 build() {
   cd ${srcdir}/binutils-build
 
-  ${srcdir}/binutils-gdb/configure --prefix=/usr \
+  ${srcdir}/binutils-gdb/configure \
+    --prefix=/usr \
     --with-lib-path=/usr/lib:/usr/local/lib \
     --with-bugurl=https://bugs.archlinux.org/ \
-    --enable-threads --enable-shared --with-pic \
-    --enable-ld=default --enable-gold --enable-plugins \
+    --enable-threads \
+    --enable-shared \
+    --with-pic \
+    --enable-ld=default \
+    --enable-gold \
+    --enable-plugins \
     --enable-deterministic-archives \
-    --disable-werror --disable-gdb
+    --disable-werror \
+    --disable-gdb
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
diff --git a/binutils.install b/binutils.install
deleted file mode 100644
index 9de0533eec4b..000000000000
--- a/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info gprof.info ld.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-