From 231e557c4c8e83cf6cd88b55fa55d11ec4a8b2e3 Mon Sep 17 00:00:00 2001
From: satmandu <satadru@umich.edu>
Date: Sun, 11 Apr 2021 22:19:05 -0400
Subject: [PATCH] Binutils rebuild to stop putting files in /usr/local/CREW_TGT
 (#5592)

---
 packages/binutils.rb | 51 +++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/binutils.rb b/packages/binutils.rb
index 45e8fc4f7..e7c4255e9 100644
--- a/packages/binutils.rb
+++ b/packages/binutils.rb
@@ -4,44 +4,56 @@ class Binutils < Package
   description 'The GNU Binutils are a collection of binary tools.'
   homepage 'https://www.gnu.org/software/binutils/'
   @_ver = '2.36.1'
-  version @_ver
+  version "#{@_ver}-1"
   license 'GPL-3+'
   compatibility 'all'
   source_url "https://ftpmirror.gnu.org/binutils/binutils-#{@_ver}.tar.xz"
   source_sha256 'e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0'
 
   binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-chromeos-x86_64.tar.xz'
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/binutils-2.36.1-1-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
-    aarch64: '22a88c3eb29672805441c78fa2c37414a4d49bec790252391c1caf45edc20426',
-     armv7l: '22a88c3eb29672805441c78fa2c37414a4d49bec790252391c1caf45edc20426',
-       i686: '7f47210024759db0485292d7695f46532ae0c4c579c03ba0c6450a5174ce9f6f',
-     x86_64: '624fb52ce022d6caea7c99a8c6a08f872e51fe0c8be09bb3c3f72e186ad60d3a'
+    aarch64: '3f580f50aa890e57b2faead8c500982890b03c834a0808d1ee8fbf8f91df706f',
+     armv7l: '3f580f50aa890e57b2faead8c500982890b03c834a0808d1ee8fbf8f91df706f',
+       i686: '791e202c0fa73426b35ba072f4bd7d08150792d56ed0a55fd92921373eeef1ed',
+     x86_64: '564af95307c729f0199717dbb770a7dae08c3cb3818298689f809076c45fa9c5'
   })
 
-  def self.build
+  def self.patch
     system 'filefix'
+    system "sed -i 's,scriptdir = \$(tooldir)/lib,scriptdir = \$(tooldir)/#{ARCH_LIB},g' ld/Makefile.am"
+    Dir.chdir 'ld' do
+      system 'aclocal && automake'
+    end
+  end
+
+  def self.build
     Dir.mkdir 'build'
     Dir.chdir 'build' do
       system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \
         LDFLAGS='-flto=auto' \
         ../configure #{CREW_OPTIONS} \
-        --with-system-zlib \
-        --disable-maintainer-mode \
-        --enable-shared \
-        --enable-gold \
-        --enable-ld=default \
-        --enable-plugins \
         --disable-bootstrap \
+        --disable-maintainer-mode \
         --enable-64-bit-bfd \
+        --enable-gold \
+        --enable-install-libiberty \
+        --enable-ld=default \
         --enable-lto \
+        --enable-plugins \
+        --enable-relro \
+        --enable-shared \
+        --enable-threads \
         --enable-vtable-verify \
-        --enable-install-libiberty"
-      system 'make'
+        --with-pic \
+        --with-lib-path=#{CREW_LIB_PREFIX} \
+        --with-system-zlib"
+      system 'make configure-host'
+      system "make tooldir=#{CREW_PREFIX}"
     end
   end
 
@@ -53,7 +65,8 @@ class Binutils < Package
 
   def self.install
     Dir.chdir 'build' do
-      system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+      system 'make', "DESTDIR=#{CREW_DEST_DIR}", "prefix=#{CREW_PREFIX}",
+             "tooldir=#{CREW_PREFIX}", 'install'
     end
   end
 end