dev-util/soong: remove sysroot specifications.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

3 files changed, 76 insertions, 1 deletions

diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest
index d3f485f..df62d15 100644
--- a/dev-util/soong/Manifest
+++ b/dev-util/soong/Manifest
@@ -5,9 +5,10 @@ AUX soong-gentoo-host-bin.patch 1141 BLAKE2B d15738ce12aeb54e63e2f540b992fb6ed19
 AUX soong-gentoo-toolchain.patch 3277 BLAKE2B a80102f14af1b73768e8efa441bd050ef0ca425c4d0af4ee2c2991b9c41de09446c4cc2b9dc5694e65e84ba12b129790ec56b6286f0ce7a76077cd7a81f66a55 SHA512 b31787d6045ba003be519102a3a2a79c08d4eda1f664f9637f59daada3ea761b0b502642054120b27dd4544f742aafc420ed44ea0a00409030fa72f1092a5437
 AUX soong-no-bootstrap.patch 1519 BLAKE2B 26b70aa67ed07e6ff5166d04f2d11e40b6c9c6a444cb4b8171f3b2d99ea35de194ed3916eb0027d80d2c61b0ae4ece89fa7d61bf48564de11ab40f6faba5d8aa SHA512 f90988259f308a5bc3843965391bad1a2be0f4a64eaa31284a7522d21832bf5e9095c08c3509acbc0ece982888dcb6f90e77116839eadd48be71eb53224e167f
 AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be
+AUX soong-no-sysroot.patch 2875 BLAKE2B 092422fbb204b5413418a36cf6d6bc5504339c082c7261df00140a1fa76f09070e50e5b730a1c3a55d87be9f2327ff3a1010889e6dbd6989b1b47142911f6e49 SHA512 d230fa5bfcc7121615c99db5bf07c0adfa580bd8aa958ba600ee5e027b454f27bf08aa596c93ea7099ab195fb6a94a5a32afdf5d8e16548961bc580c14cafb03
 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 49859452 BLAKE2B c4de3918fa6aff6f24b27fdbde5434b2cfb9d8fb8632e64ce007857de3ad08f3a48d50cc8cee158df3daf29d2330f63ae71b433b0cde888ce3f13d152aab8563 SHA512 6f67ddaa087da4c2d379331367b839025aed75a976c05c1f3562f715d05de387a938969488e2979be8286eed1db4a90652c73eec5e58c728174aa50197229fa7
 EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68 SHA512 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca
-EBUILD soong-9999.ebuild 2235 BLAKE2B efaa432fd695b59851af050c259490e78c8621ea07636d4d2216581d25c0e068893537ff2481f9af198bb3393e71536fd67764f859d14082c40440153322a5be SHA512 627bdd454f463969bab5d3e7061eb353746882f204207bcae0d592eba806680321e850902dd816c19e5bbd3f5405a8a34c29011e9efb1566e59472fc58ce331a
+EBUILD soong-9999.ebuild 2273 BLAKE2B ba05810a5fcd98c747691cc3d0d3cdb505186148f28f17815b193239a51bd22215c89b9e7496cf192c75913aba603595f9766b8489c1097be29a224f9f5e644b SHA512 8449966efccacdd325e7525285d51591557bf3f43f23d38aaa5ac29affcb682a9bb46de1596bd178aab62eb794680ff5bb0e0bc521ce910e1a8dfacad82ef590
 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21
diff --git a/dev-util/soong/files/soong-no-sysroot.patch b/dev-util/soong/files/soong-no-sysroot.patch
new file mode 100644
index 0000000..6b8a5d2
--- /dev/null
+++ b/dev-util/soong/files/soong-no-sysroot.patch
@@ -0,0 +1,73 @@
+Index: soong-9999/build/soong/cc/compiler.go
+===================================================================
+--- soong-9999.orig/build/soong/cc/compiler.go
++++ soong-9999/build/soong/cc/compiler.go
+@@ -301,11 +301,10 @@ func (compiler *baseCompiler) compilerFl
+ 		flags.LdFlags = config.ClangFilterUnknownCflags(flags.LdFlags)
+ 
+ 		target := "-target " + tc.ClangTriple()
+-		gccPrefix := "-B" + config.ToolPath(tc)
+ 
+-		flags.CFlags = append(flags.CFlags, target, gccPrefix)
+-		flags.AsFlags = append(flags.AsFlags, target, gccPrefix)
+-		flags.LdFlags = append(flags.LdFlags, target, gccPrefix)
++		flags.CFlags = append(flags.CFlags, target)
++		flags.AsFlags = append(flags.AsFlags, target)
++		flags.LdFlags = append(flags.LdFlags, target)
+ 	}
+ 
+ 	hod := "Host"
+Index: soong-9999/build/soong/cc/config/x86_linux_host.go
+===================================================================
+--- soong-9999.orig/build/soong/cc/config/x86_linux_host.go
++++ soong-9999/build/soong/cc/config/x86_linux_host.go
+@@ -77,39 +77,25 @@ var (
+ 	}
+ 
+ 	linuxClangCflags = append(ClangFilterUnknownCflags(linuxCflags), []string{
+-		"--gcc-toolchain=${LinuxGccRoot}",
+-		"--sysroot ${LinuxGccRoot}/sysroot",
+ 		"-fstack-protector-strong",
+ 	}...)
+ 
+ 	linuxClangLdflags = append(ClangFilterUnknownCflags(linuxLdflags), []string{
+-		"--gcc-toolchain=${LinuxGccRoot}",
+-		"--sysroot ${LinuxGccRoot}/sysroot",
+ 	}...)
+ 
+ 	linuxX86ClangLdflags = append(ClangFilterUnknownCflags(linuxX86Ldflags), []string{
+-		"-B${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}/32",
+-		"-L${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}/32",
+-		"-L${LinuxGccRoot}/${LinuxGccTriple}/lib32",
+ 	}...)
+ 
+ 	linuxX8664ClangLdflags = append(ClangFilterUnknownCflags(linuxX8664Ldflags), []string{
+-		"-B${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}",
+-		"-L${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}",
+-		"-L${LinuxGccRoot}/${LinuxGccTriple}/lib64",
+ 	}...)
+ 
+ 	linuxClangCppflags = []string{
+-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}",
+-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/backward",
+ 	}
+ 
+ 	linuxX86ClangCppflags = []string{
+-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/${LinuxGccTriple}/32",
+ 	}
+ 
+ 	linuxX8664ClangCppflags = []string{
+-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/${LinuxGccTriple}",
+ 	}
+ 
+ 	linuxAvailableLibraries = addPrefix([]string{
+@@ -134,9 +120,6 @@ const (
+ func init() {
+ 	pctx.StaticVariable("LinuxGccVersion", linuxGccVersion)
+ 
+-	pctx.SourcePathVariable("LinuxGccRoot",
+-		"prebuilts/gcc/${HostPrebuiltTag}/host/x86_64-linux-glibc2.15-${LinuxGccVersion}")
+-
+ 	pctx.StaticVariable("LinuxGccTriple", "x86_64-linux")
+ 
+ 	pctx.StaticVariable("LinuxCflags", strings.Join(linuxCflags, " "))
diff --git a/dev-util/soong/soong-9999.ebuild b/dev-util/soong/soong-9999.ebuild
index 8cc8c07..4c78f65 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-no-sysroot.patch
 	"${FILESDIR}"/soong-gentoo-toolchain.patch
 	"${FILESDIR}"/soong-gentoo-host-bin.patch
 )