From 744e439c571a9bc2a6cbd07aef047f5473d29b3d Mon Sep 17 00:00:00 2001 From: mas0n Date: Sun, 28 Aug 2022 15:41:46 +0800 Subject: [PATCH 1/2] fix binutils instance clashes in MacOS. --- macos/a.out | 0 macos/binutils-aarch64.rb | 1 + macos/binutils-alpha.rb | 1 + macos/binutils-amd64.rb | 1 + macos/binutils-arm.rb | 1 + macos/binutils-avr.rb | 1 + macos/binutils-cris.rb | 1 + macos/binutils-hppa.rb | 1 + macos/binutils-i386.rb | 1 + macos/binutils-ia64.rb | 1 + macos/binutils-m68k.rb | 1 + macos/binutils-mips.rb | 1 + macos/binutils-mips64.rb | 1 + macos/binutils-msp430.rb | 1 + macos/binutils-powerpc.rb | 1 + macos/binutils-powerpc64.rb | 1 + macos/binutils-s390.rb | 1 + macos/binutils-sparc.rb | 1 + macos/binutils-sparc64.rb | 1 + macos/binutils-vax.rb | 1 + macos/binutils-x86_64.rb | 1 + macos/binutils-xscale.rb | 1 + macos/generate.sh | 1 + 23 files changed, 22 insertions(+) create mode 100644 macos/a.out diff --git a/macos/a.out b/macos/a.out new file mode 100644 index 0000000..e69de29 diff --git a/macos/binutils-aarch64.rb b/macos/binutils-aarch64.rb index e29f834..fb6a833 100644 --- a/macos/binutils-aarch64.rb +++ b/macos/binutils-aarch64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=aarch64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-alpha.rb b/macos/binutils-alpha.rb index d3f9ab2..a535fcb 100644 --- a/macos/binutils-alpha.rb +++ b/macos/binutils-alpha.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=alpha-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-amd64.rb b/macos/binutils-amd64.rb index 2a43a2c..33f4a5f 100644 --- a/macos/binutils-amd64.rb +++ b/macos/binutils-amd64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=amd64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-arm.rb b/macos/binutils-arm.rb index 0bf74c8..4a71f35 100644 --- a/macos/binutils-arm.rb +++ b/macos/binutils-arm.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=arm-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-avr.rb b/macos/binutils-avr.rb index 3f74d2c..148daf9 100644 --- a/macos/binutils-avr.rb +++ b/macos/binutils-avr.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=avr-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-cris.rb b/macos/binutils-cris.rb index 37cbbbc..6aa878a 100644 --- a/macos/binutils-cris.rb +++ b/macos/binutils-cris.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=cris-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-hppa.rb b/macos/binutils-hppa.rb index 44c4cf6..42d4572 100644 --- a/macos/binutils-hppa.rb +++ b/macos/binutils-hppa.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=hppa-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-i386.rb b/macos/binutils-i386.rb index 7dcef6f..8a7a0f4 100644 --- a/macos/binutils-i386.rb +++ b/macos/binutils-i386.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=i386-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-ia64.rb b/macos/binutils-ia64.rb index 8058b20..6267e28 100644 --- a/macos/binutils-ia64.rb +++ b/macos/binutils-ia64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=ia64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-m68k.rb b/macos/binutils-m68k.rb index b3a542a..a048f80 100644 --- a/macos/binutils-m68k.rb +++ b/macos/binutils-m68k.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=m68k-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-mips.rb b/macos/binutils-mips.rb index c10239a..aa448bb 100644 --- a/macos/binutils-mips.rb +++ b/macos/binutils-mips.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=mips-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-mips64.rb b/macos/binutils-mips64.rb index c09c6ab..e6afc92 100644 --- a/macos/binutils-mips64.rb +++ b/macos/binutils-mips64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=mips64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-msp430.rb b/macos/binutils-msp430.rb index f80ef59..29f23c6 100644 --- a/macos/binutils-msp430.rb +++ b/macos/binutils-msp430.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=msp430-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-powerpc.rb b/macos/binutils-powerpc.rb index f22dec3..49f6e96 100644 --- a/macos/binutils-powerpc.rb +++ b/macos/binutils-powerpc.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=powerpc-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-powerpc64.rb b/macos/binutils-powerpc64.rb index cd541aa..9c62a2c 100644 --- a/macos/binutils-powerpc64.rb +++ b/macos/binutils-powerpc64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=powerpc64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-s390.rb b/macos/binutils-s390.rb index 32a69da..96dabef 100644 --- a/macos/binutils-s390.rb +++ b/macos/binutils-s390.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=s390-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-sparc.rb b/macos/binutils-sparc.rb index 4e94ea8..c1b2706 100644 --- a/macos/binutils-sparc.rb +++ b/macos/binutils-sparc.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=sparc-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-sparc64.rb b/macos/binutils-sparc64.rb index cbde7a8..0b1a27f 100644 --- a/macos/binutils-sparc64.rb +++ b/macos/binutils-sparc64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=sparc64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-vax.rb b/macos/binutils-vax.rb index 0c46e98..818a583 100644 --- a/macos/binutils-vax.rb +++ b/macos/binutils-vax.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=vax-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-x86_64.rb b/macos/binutils-x86_64.rb index a6c43a9..0ccbfb3 100644 --- a/macos/binutils-x86_64.rb +++ b/macos/binutils-x86_64.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=x86_64-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/binutils-xscale.rb b/macos/binutils-xscale.rb index aff607a..00afd78 100644 --- a/macos/binutils-xscale.rb +++ b/macos/binutils-xscale.rb @@ -10,6 +10,7 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=xscale-unknown-linux-gnu", "--disable-static", "--disable-multilib", diff --git a/macos/generate.sh b/macos/generate.sh index d8363a5..19611c6 100755 --- a/macos/generate.sh +++ b/macos/generate.sh @@ -23,6 +23,7 @@ class Binutils$(title_case $arch) < Formula system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", + "--libdir=#{prefix}/#{name}", "--target=$arch-unknown-linux-gnu", "--disable-static", "--disable-multilib", From 5f9f10d0a424326d813a1f15204d665c468958b2 Mon Sep 17 00:00:00 2001 From: mas0n Date: Sun, 28 Aug 2022 15:47:03 +0800 Subject: [PATCH 2/2] fix binutils instance clashes in MacOS. (remove rubbish file) --- macos/a.out | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 macos/a.out diff --git a/macos/a.out b/macos/a.out deleted file mode 100644 index e69de29..0000000