From 8a2d91a1818c1b54da30355f5ebe61eb9db20b60 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Sun, 3 Mar 2019 11:25:03 +0100
Subject: [PATCH] Make sure binutils ldscripts and binaries are packaged for
 toolchain

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 pkg/tc-binutils/build | 26 ++++++++++++++++++++++++--
 pkg/tc-gcc1/build     |  1 +
 pkg/toolchain/build   |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkg/tc-binutils/build b/pkg/tc-binutils/build
index f1c2c10..0bfe51a 100755
--- a/pkg/tc-binutils/build
+++ b/pkg/tc-binutils/build
@@ -23,10 +23,32 @@ build() {
 }
 
 deploy() {
+	local SOURCE="$1"
+	local DEPLOY="$2"
+
 	make install
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	cat > "$DEPLOY/$PKGNAME.files" <<_EOF
+dir bin 0755 0 0
+dir lib 0755 0 0
+dir lib/ldscripts 0755 0 0
+file bin/ar 0755 0 0 $TCDIR/$TARGET/bin/ar
+file bin/as 0755 0 0 $TCDIR/$TARGET/bin/as
+file bin/ld 0755 0 0 $TCDIR/$TARGET/bin/ld
+file bin/ld.bfd 0755 0 0 $TCDIR/$TARGET/bin/ld.bfd
+file bin/nm 0755 0 0 $TCDIR/$TARGET/bin/nm
+file bin/objcopy 0755 0 0 $TCDIR/$TARGET/bin/objcopy
+file bin/objdump 0755 0 0 $TCDIR/$TARGET/bin/objdump
+file bin/ranlib 0755 0 0 $TCDIR/$TARGET/bin/ranlib
+file bin/readelf 0755 0 0 $TCDIR/$TARGET/bin/readelf
+file bin/strip 0755 0 0 $TCDIR/$TARGET/bin/strip
+_EOF
+
+	find -H "$TCDIR/$TARGET/lib/ldscripts" -type f \
+	     -printf "file lib/ldscripts/%f 0%m 0 0 %p\\n" \
+	     >> "$DEPLOY/$PKGNAME.files"
+
+	cat > "$DEPLOY/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-gcc1/build b/pkg/tc-gcc1/build
index f9cc9d0..2b43e75 100755
--- a/pkg/tc-gcc1/build
+++ b/pkg/tc-gcc1/build
@@ -64,6 +64,7 @@ deploy() {
 	touch "$2/$PKGNAME.files"
 	cat > "$2/$PKGNAME.desc" <<_EOF
 name $PKGNAME
+requires tc-binutils linux-dev fortify-headers
 _EOF
 }
 
diff --git a/pkg/toolchain/build b/pkg/toolchain/build
index 0d7c858..bb13856 100755
--- a/pkg/toolchain/build
+++ b/pkg/toolchain/build
@@ -1,4 +1,4 @@
-DEPENDS="crt-dev tc-pkg-config tc-file tc-pkgtool"
+DEPENDS="tc-binutils crt-dev tc-pkg-config tc-file tc-pkgtool"
 
 build() {
 	return