dev-util/soong: remove dependencies on prebuilt toolchain.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

3 files changed, 83 insertions, 3 deletions

diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest
index 1a7d1bc..3a27063 100644
--- a/dev-util/soong/Manifest
+++ b/dev-util/soong/Manifest
@@ -1,11 +1,12 @@
 AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480
 AUX soong-9999-bootstrap-clean.patch 1539 BLAKE2B 95c06e8242d4d2e7a65d0f5e25b77bfe8079edf71213be318465250c78a1869e0b9ac0a7bb7be8123f586d1150a86951fb30b021230f3e3857ecdbdadab61d63 SHA512 b08a6314e3bee2b6d3ee7fa60afe3678a61d08c4930f9e55a643cf3bbe3373fef08d245b048a03a246d9cb0f9b3974b7e1dcb3f44f614cd9fd7f062d5c096384
 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972
+AUX soong-gentoo-toolchain.patch 2253 BLAKE2B 5ee0fae010c0ae60d82c1b1afb11070eab8b5b6d8c2d193509006001539c8a250ee5198f8f246fd9f26b0420fc7ccc936d5f2bd930fa84985482f5c98f95ac14 SHA512 0936eeba3120b866be87cb7584ab3dc6d84a0a67e7f191cd1bdaeab11816e21c4db5cd68a8eb4a2de50fe4791ce723ba313de4a479fa68b92353e7f29ccef404
 AUX soong-no-bootstrap.patch 719 BLAKE2B 2d6bef0e256f4bf1c7bac48b1a725aaf53f061ec04b67dcc47a94fcb406cc32499557c9c97198748a904a6ab5e9a5ff4d375de2ca0f030deabe31e177795b8bd SHA512 05617b717c05eecd1b6971a4e72302341904a23481fccca83beb9b329ba91afda562b0d594600e2a91d784995dcf125fc71c955da60d0a1648128c71ec751c33
 AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be
 DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B cb2335fd766212d1c3279ae4d6ee91df5f3c3a9522230ca70cbc080eed9b387a7d567963ba8ea5ffc4a48b01400958cc1d619b9da897e0f90a29b4446becdf46 SHA512 8ada4f309767567e7e08e6c8e61f0e442eb14a59333323bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b
 DIST soong-8.1.0_p41.tar.gz 355543 BLAKE2B 0d2b47c30d0515426cffa19c73495f68633dcdbcd5fc33fbbabb8892b712eb85ec68657ea73e07b34573af525055c0f791cd6b54ca58dedd5c14bd4af1a37623 SHA512 50f65ac86f4466adfed6fddf6e8288e16fdc0c1717ba57e59d40395115d4f55ceed3407ce6542ef0173c2076783a7bdc908ff0aac6f19aad7c62a8f63daef6e3
-DIST vendor-lineage-15.1.tar.gz 49859612 BLAKE2B 2203f51a8610100c9b6e3754d54da0310414abfac60b21a7fb4739f8f70bfc81cf0f61fb820b82891fbaf4bc89162d2b891c9c75ef86abe61de91525b7cb5e61 SHA512 5f7f92cf310d45c51f687a84205a8de68390fd2462e754bbe8d7226041e19938614d4f68eafb046dbb34ad29c67d70cfa6a3bea98841935d2c1659a5ee7c90c9
+DIST vendor-lineage-15.1.tar.gz 49859452 BLAKE2B c4de3918fa6aff6f24b27fdbde5434b2cfb9d8fb8632e64ce007857de3ad08f3a48d50cc8cee158df3daf29d2330f63ae71b433b0cde888ce3f13d152aab8563 SHA512 6f67ddaa087da4c2d379331367b839025aed75a976c05c1f3562f715d05de387a938969488e2979be8286eed1db4a90652c73eec5e58c728174aa50197229fa7
 EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68 SHA512 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca
-EBUILD soong-9999.ebuild 2015 BLAKE2B c0e5661fcaa99f02177316e80d3dc94c8626425200ff035fbafcfd95779500b8778cdf5293fbe59a774363e1cf94d6e1886f78a399ba55ac43fb3a457368ea1a SHA512 19527b1876ed8fc50b905e185d984b056f49e788ce165ddeaefe490e012f74a17d80a853a0b09d588d3454e9f93481c0fb9249f2911f0cf60cbe61d08e4cdc3c
+EBUILD soong-9999.ebuild 2066 BLAKE2B 4e6091f8df826ff182d1d6a947c811955657d8541b61a11a92b999c3256659f2592108194c96386d88722b7c73716a3b6cb9149df377c7ff55a968a9e39f58e2 SHA512 23e87473eb71d5b8bf8fbc397515109b9b73421ec834f5e896fe12d736f30d98763c91039edf0a14e1d34937f620c055d32ab40f14b73bccd5f61599f655e108
 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21
diff --git a/dev-util/soong/files/soong-gentoo-toolchain.patch b/dev-util/soong/files/soong-gentoo-toolchain.patch
new file mode 100644
index 0000000..81a755c
--- /dev/null
+++ b/dev-util/soong/files/soong-gentoo-toolchain.patch
@@ -0,0 +1,78 @@
+Index: soong-9999/build/soong/cc/builder.go
+===================================================================
+--- soong-9999.orig/build/soong/cc/builder.go
++++ soong-9999/build/soong/cc/builder.go
+@@ -20,7 +20,6 @@ package cc
+ 
+ import (
+ 	"fmt"
+-	"path/filepath"
+ 	"runtime"
+ 	"strconv"
+ 	"strings"
+@@ -44,7 +43,6 @@ var (
+ 			Depfile:     "${out}.d",
+ 			Deps:        blueprint.DepsGCC,
+ 			Command:     "$relPwd ${config.CcWrapper}$ccCmd -c $cFlags -MD -MF ${out}.d -o $out $in",
+-			CommandDeps: []string{"$ccCmd"},
+ 		},
+ 		"ccCmd", "cFlags")
+ 
+@@ -52,7 +50,6 @@ var (
+ 		blueprint.RuleParams{
+ 			Command: "$ldCmd ${crtBegin} @${out}.rsp " +
+ 				"${libFlags} ${crtEnd} -o ${out} ${ldFlags}",
+-			CommandDeps:    []string{"$ldCmd"},
+ 			Rspfile:        "${out}.rsp",
+ 			RspfileContent: "${in}",
+ 		},
+@@ -61,14 +58,12 @@ var (
+ 	partialLd = pctx.AndroidStaticRule("partialLd",
+ 		blueprint.RuleParams{
+ 			Command:     "$ldCmd -nostdlib -Wl,-r ${in} -o ${out} ${ldFlags}",
+-			CommandDeps: []string{"$ldCmd"},
+ 		},
+ 		"ldCmd", "ldFlags")
+ 
+ 	ar = pctx.AndroidStaticRule("ar",
+ 		blueprint.RuleParams{
+ 			Command:        "rm -f ${out} && $arCmd $arFlags $out @${out}.rsp",
+-			CommandDeps:    []string{"$arCmd"},
+ 			Rspfile:        "${out}.rsp",
+ 			RspfileContent: "${in}",
+ 		},
+@@ -385,7 +380,6 @@ func TransformSourceToObj(ctx android.Mo
+ 		ccDesc := ccCmd
+ 
+ 		if flags.clang {
+-			ccCmd = "${config.ClangBin}/" + ccCmd
+ 		} else {
+ 			ccCmd = gccCmd(flags.toolchain, ccCmd)
+ 		}
+@@ -568,7 +562,7 @@ func TransformObjToDynamicBinary(ctx and
+ 
+ 	var ldCmd string
+ 	if flags.clang {
+-		ldCmd = "${config.ClangBin}/clang++"
++		ldCmd = "clang++"
+ 	} else {
+ 		ldCmd = gccCmd(flags.toolchain, "g++")
+ 	}
+@@ -714,7 +708,7 @@ func TransformObjsToObj(ctx android.Modu
+ 
+ 	var ldCmd string
+ 	if flags.clang {
+-		ldCmd = "${config.ClangBin}/clang++"
++		ldCmd = "clang++"
+ 	} else {
+ 		ldCmd = gccCmd(flags.toolchain, "g++")
+ 	}
+@@ -817,7 +811,7 @@ func CopyGccLib(ctx android.ModuleContex
+ }
+ 
+ func gccCmd(toolchain config.Toolchain, cmd string) string {
+-	return filepath.Join(toolchain.GccRoot(), "bin", toolchain.GccTriple()+"-"+cmd)
++	return cmd
+ }
+ 
+ func splitListForSize(list android.Paths, limit int) (lists []android.Paths, err error) {
diff --git a/dev-util/soong/soong-9999.ebuild b/dev-util/soong/soong-9999.ebuild
index da35cf9..9fca1af 100644
--- a/dev-util/soong/soong-9999.ebuild
+++ b/dev-util/soong/soong-9999.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/soong-9999-bootstrap-clean.patch
 	"${FILESDIR}"/soong-no-kernel-header.patch
 	"${FILESDIR}"/soong-no-bootstrap.patch
+	"${FILESDIR}"/soong-gentoo-toolchain.patch
 )
 
 src_unpack() {
@@ -34,7 +35,7 @@ src_unpack() {
 
 	mkdir -p "${S}"/vendor || die
 	cd "${S}"/vendor || die
-	unpack lineage-15.1.tar.gz
+	unpack vendor-lineage-15.1.tar.gz
 	mv android_vendor_lineage-lineage-15.1 lineage || die
 
 	mkdir -p "${S}"/build/blueprint || die