aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarian Buschsieweke <marian.buschsieweke@ovgu.de>2021-04-01 23:28:50 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-04-15 07:56:35 +0000
commit1ad89e5db611c353a5961adae08964b006601b0b (patch)
tree8beb8413f1efb81eeb59aa76820766875f1c7d87
parent5437a9559c6f74b3fbe0763f9cae5f40bb40baeb (diff)
downloadaports-1ad89e5db611c353a5961adae08964b006601b0b.tar.gz
aports-1ad89e5db611c353a5961adae08964b006601b0b.tar.bz2
aports-1ad89e5db611c353a5961adae08964b006601b0b.tar.xz
community/binutils-cross-embedded: change AVR toolchain path
drop patch for AVR, just use /usr/avr/{lib,include} for toolchain just like for all the other toolchains.
-rw-r--r--community/binutils-cross-embedded/APKBUILD7
-rw-r--r--community/binutils-cross-embedded/avr-ldscript-path.patch25
2 files changed, 2 insertions, 30 deletions
diff --git a/community/binutils-cross-embedded/APKBUILD b/community/binutils-cross-embedded/APKBUILD
index 7dc6dea03a..6b93a30e83 100644
--- a/community/binutils-cross-embedded/APKBUILD
+++ b/community/binutils-cross-embedded/APKBUILD
@@ -23,9 +23,7 @@ for target in $_targets; do
targetnorm="${target//-/_}"
subpackages="$_pkgbase-$target:$targetnorm $subpackages"
done
-source="https://ftp.gnu.org/gnu/$_pkgbase/$_pkgbase-$pkgver.tar.xz
- avr-ldscript-path.patch
- "
+source="https://ftp.gnu.org/gnu/$_pkgbase/$_pkgbase-$pkgver.tar.xz"
builddir="$srcdir/$_pkgbase-$pkgver"
@@ -118,5 +116,4 @@ aarch64_none_elf() {
_install_subpkg
}
-sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz
-3dfcdfb1b3e4d2ab848e5d8af682e26a30806ce2d2f5819dbb1fbb2d005775b201b57efaecc9a54f7950b182cc0aaeb0ea79a4f6e6149473fe669bc9b3acebe0 avr-ldscript-path.patch"
+sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz"
diff --git a/community/binutils-cross-embedded/avr-ldscript-path.patch b/community/binutils-cross-embedded/avr-ldscript-path.patch
deleted file mode 100644
index 90a2e290b3..0000000000
--- a/community/binutils-cross-embedded/avr-ldscript-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-For some reason avr-ld keeps looking for the ldscripts in /usr/lib, rather than
-in /usr/avr/lib - while using /usr/$target/lib works fine for all other
-targets. This patch fixes it.
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -50,7 +50,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
-
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -555,7 +555,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include