From 6d2050d43ff8d53700a4c4012b455049138be5cf Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Wed, 9 Apr 2014 13:45:09 +0400
Subject: [PATCH] binutils: Update using Cygwin sources.

---
 binutils/PKGBUILD                   | 48 ++++++++++++++++-------------
 binutils/binutils-trunk-msys2.patch | 12 ++++----
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD
index 5cada840..7d431dc0 100644
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=binutils
-#_basever=2.24.51
-#pkgver=${_basever}.20131119
-pkgver=2.24
+_basever=2.24.51
+pkgver=${_basever}.20140408
+#pkgver=2.24.51
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
@@ -16,27 +16,30 @@ makedepends=('libiconv-devel' 'gettext-devel' 'zlib-devel')
 options=('staticlibs' '!distcc' '!ccache')
 install=binutils.install
 source=(#http://sourceware.mirrors.tds.net/pub/sourceware.org/binutils/snapshots/binutils-${_basever}.tar.bz2
-        ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
-        #binutils-2.23.2-texinfo-5.0.patch
-        cofflink.patch
+		#ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+		http://cygwin.parentingamerica.com/x86_64/release/binutils/binutils-2.24.51-2-src.tar.xz
+		02-x86-64-pc32-relocs.patch
 		2.23.52-install-libiberty.patch
-        binutils-trunk-msys2.patch)
-md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
-         'SKIP'
-         '65b166affc5cc9a422a9da90dd95bb9f'
+		binutils-trunk-msys2.patch)
+md5sums=('7f198636895e8e17489fc7d86342f148'
+         'e7e91814b32f4c4c63d4c777f5eabf7f'
          'bbedd06f1acf9cab0a8dda20380cf26b'
-         '6f7175b7ed29bc597f0d300500e2b651')
+         'ffafa01f790d8b338951382a7eee2759')
 
 prepare() {
-  cd ${srcdir}/binutils-$pkgver
-  if [ "${CARCH}" = "x86_64" ]; then
-	msg "Applying reloc patch"
-	patch -p0 -i $srcdir/cofflink.patch
-  fi
+  cd ${srcdir}/binutils-$_basever-2
+  #if [ "${CARCH}" = "x86_64" ]; then
+  #  msg "Applying reloc patch"
+  #  patch -p0 -i $srcdir/02-x86-64-pc32-relocs.patch
+  #fi
   
-  patch -p2 -i $srcdir/2.23.52-install-libiberty.patch
+  #patch -p2 -i $srcdir/2.23.52-install-libiberty.patch
   patch -p1 -i $srcdir/binutils-trunk-msys2.patch
   
+  rm -rf gdb
+  
+  #autoreconf -fi
+  
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
@@ -51,14 +54,17 @@ build() {
   else
     local _conf=''
   fi
-  ${srcdir}/binutils-${pkgver}/configure --build=${CHOST} \
+  ${srcdir}/binutils-${_basever}-2/configure \
     --prefix=/usr \
+    --build=${CHOST} \
+    --host=${CHOST} \
+    --target=${CHOST} \
     --disable-werror \
-	$_conf \
+    $_conf \
     --without-libiconv-prefix \
     --without-libintl-prefix
-#	--enable-install-libiberty 
-  make
+    #--enable-install-libiberty 
+  make -j1
 }
 
 check() {
diff --git a/binutils/binutils-trunk-msys2.patch b/binutils/binutils-trunk-msys2.patch
index 7e95eaf7..20f8e6ce 100644
--- a/binutils/binutils-trunk-msys2.patch
+++ b/binutils/binutils-trunk-msys2.patch
@@ -1330,15 +1330,15 @@ diff -Naur binutils-2.24.51/ld/configure.tgt binutils-2.24.51-msys2/ld/configure
 --- binutils-2.24.51/ld/configure.tgt	2013-10-24 16:08:08.692000000 +0400
 +++ binutils-2.24.51-msys2/ld/configure.tgt	2013-10-24 16:05:08.527600000 +0400
 @@ -310,7 +310,8 @@
- 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
  i[3-7]86-*-pe)		targ_emul=i386pe ;
+ 			targ_extra_binaries="default-manifest.o" ;
  			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 -i[3-7]86-*-cygwin*)	targ_emul=i386pe ;
 +i[3-7]86-*-cygwin* | i[3-7]86-*-msys*)
 +			targ_emul=i386pe ;
- 			targ_extra_ofiles="deffilep.o pe-dll.o"
- 			test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api:=/usr/lib/w32api' ;;
- i[3-7]86-*-mingw32*)	targ_emul=i386pe ;
+ 			targ_extra_binaries="default-manifest.o" ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;
+ 			test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;;
 @@ -318,7 +319,8 @@
  x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
  			targ_extra_emuls=i386pe ;
@@ -1803,8 +1803,8 @@ diff -Naur binutils-2.24.51/ltmain.sh binutils-2.24.51-msys2/ltmain.sh
  
  
    case $host in
--    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+    *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
+-    *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
++    *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* )
        # don't eliminate duplications in $postdeps and $predeps
        opt_duplicate_compiler_generated_deps=:
        ;;