[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 6427c251dace5298bfee1420d80808e0250e92f0 Author: Benda Xu gentoo org> AuthorDate: Mon Aug 13 14:19:59 2018 + Commit: Benda XU gentoo org> CommitDate: Mon Aug 13 14:37:32 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=6427c251 dev-util/soong: Combined hack to support gentoo toolchain. Add google llvm-tblgen. Google llvm-tblgen is completely different from upstream. Make toc.sh an executable. Gentoo toolchain defaults with -pie, so replace -Wl,-r with -r. Disable strip, as it is managed by portage. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 9 -- dev-util/soong/files/soong-gentoo-host-bin.patch | 10 +-- dev-util/soong/files/soong-gentoo-toolchain.patch | 8 -- dev-util/soong/files/soong-no-strip.patch | 34 +++ dev-util/soong/files/soong-relative-symlink.patch | 13 + dev-util/soong/soong-.ebuild | 23 ++- 6 files changed, 82 insertions(+), 15 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 3e6f6d1..f3f098e 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,14 +1,17 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 AUX soong--bootstrap-clean.patch 1539 BLAKE2B 95c06e8242d4d2e7a65d0f5e25b77bfe8079edf71213be318465250c78a1869e0b9ac0a7bb7be8123f586d1150a86951fb30b021230f3e3857ecdbdadab61d63 SHA512 b08a6314e3bee2b6d3ee7fa60afe3678a61d08c4930f9e55a643cf3bbe3373fef08d245b048a03a246d9cb0f9b3974b7e1dcb3f44f614cd9fd7f062d5c096384 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 -AUX soong-gentoo-host-bin.patch 1141 BLAKE2B d15738ce12aeb54e63e2f540b992fb6ed1989dfbb53a1b53f8cb0a99b3d30be2ae8ce598fb37f13fd68053e1b2deae0a4e112ab243186bf656662484ae278ca2 SHA512 c6eda77f2f2db1c0fe9b2556966b3015bda409198766a22dfca73dfbca2ed944355e129570e626e1849ee00353a9f229678091f66fed4a61bc5b7e270e33169c -AUX soong-gentoo-toolchain.patch 3277 BLAKE2B a80102f14af1b73768e8efa441bd050ef0ca425c4d0af4ee2c2991b9c41de09446c4cc2b9dc5694e65e84ba12b129790ec56b6286f0ce7a76077cd7a81f66a55 SHA512 b31787d6045ba003be519102a3a2a79c08d4eda1f664f9637f59daada3ea761b0b502642054120b27dd4544f742aafc420ed44ea0a00409030fa72f1092a5437 +AUX soong-gentoo-host-bin.patch 1294 BLAKE2B c9c438dcf66da6663becf5b5919fcf3607d40e2be79d4a7ccea2a4efde7decb099bd12969018f6c65bd9def7eddc26d21cafa2da0c65ac3cad89d232cd409d7d SHA512 eabbab9089cfd637e8904e4bc26b496ac4610d07dae4f71d6fbbe37101945af0620932e90e2c411cdca2982d7796ed09ec4efe145d2377e6fbc0f627265ff5b1 +AUX soong-gentoo-toolchain.patch 3320 BLAKE2B 96ec1e0ccdbd732f1c6b30713702b01e133c71bc6c29bcdaac75e0c39abeeacda1d2b563a26004545cef3f80fe7c0041fe59bf76bb4092844be659602f92628f SHA512 a79fce88eefc422c29866cdd9ab89202a6d24e719ba4d2c8299860b95167fd5bcf9e1e4b4da0c6af2e8636ebae44e46394397f069087f4cd5a1ade244cb27943 AUX soong-no-bootstrap.patch 1519 BLAKE2B 26b70aa67ed07e6ff5166d04f2d11e40b6c9c6a444cb4b8171f3b2d99ea35de194ed3916eb0027d80d2c61b0ae4ece89fa7d61bf48564de11ab40f6faba5d8aa SHA512 f90988259f308a5bc3843965391bad1a2be0f4a64eaa31284a7522d21832bf5e9095c08c3509acbc0ece982888dcb6f90e77116839eadd48be71eb53224e167f AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be +AUX soong-no-strip.patch 1355 BLAKE2B d5c4fbeacc48467f463dfd7db6b4af500fbf368f4dac470092c07ecd8ca11eca1d58ab94312f7a89dfb4e3d3bfa6370bfb3e744f1b5a0986c0fd0d59800e2135 SHA512 b5d1799922c04df026e13f0b8f9169d9d73e669977d0a394ebf5f18c8d56a6913dfaa05f63e91023fb390ca4e5f0c0ac20ddc71817a4d15fd72704533c1a4c0b AUX soong-no-sysroot.patch 2875 BLAKE2B 092422fbb204b5413418a36cf6d6bc5504339c082c7261df00140a1fa76f09070e50e5b730a1c3a55d87be9f2327ff3a1010889e6dbd6989b1b47142911f6e49 SHA512 d230fa5bfcc7121615c99db5bf07c0adfa580bd8aa958ba600ee5e027b454f27bf08aa596c93ea7099ab195fb6a94a5a32afdf5d8e16548961bc580c14cafb03 +AUX soong-relative-symlink.patch 466 BLAKE2B c7d682565434e444eaab65bfc516f59ddf909e389e970d5837f8fb7c5b1da73214fddd67659e01312a4462580e27e09c7c167782469402117624cd7fe3fbcae3 SHA512 7a268abcb11e126c29988bcc1e4805fac37badf08112f12efce7a659c54cdf833252d023638ccd9e9531d82dd72062e4bf5dccb96bd93f6
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: e1e68657743e25314b42453e23073a889791fb8d Author: Benda Xu gentoo org> AuthorDate: Sun Aug 12 18:39:57 2018 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 12 18:39:57 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=e1e68657 dev-util/soong: make copygcclib.sh executable. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 2 +- dev-util/soong/soong-.ebuild | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index df62d15..3e6f6d1 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -10,5 +10,5 @@ DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B cb2335fd766212d1c3279ae4d6ee91df5 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-.ebuild 2273 BLAKE2B ba05810a5fcd98c747691cc3d0d3cdb505186148f28f17815b193239a51bd22215c89b9e7496cf192c75913aba603595f9766b8489c1097be29a224f9f5e644b SHA512 8449966efccacdd325e7525285d51591557bf3f43f23d38aaa5ac29affcb682a9bb46de1596bd178aab62eb794680ff5bb0e0bc521ce910e1a8dfacad82ef590 +EBUILD soong-.ebuild 2323 BLAKE2B f5d6668842262a81e81529d7a8095459f4ba4b44d9619865fdfb8a55b3d3cf74ae3d20ce61490139d4c7d8abb4441e14a26b1b8e04fdc88f613ef2c0e38e43ca SHA512 e0f402b41f45302fbacf88da7165f25a2539ef7d306162fae201a263022f9cbaebccd78c3ef77eed4e6577f6aa9b7205975e8c86977b998df2a3cd4cf77ddae3 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/soong-.ebuild b/dev-util/soong/soong-.ebuild index 4c78f65..5b90d90 100644 --- a/dev-util/soong/soong-.ebuild +++ b/dev-util/soong/soong-.ebuild @@ -75,4 +75,5 @@ src_install() { insinto /usr/share/soong doins "${T}"/{Android,root}.bp doins -r build/soong/scripts + fperms +x /usr/share/soong/scripts/copygcclib.sh }
[gentoo-commits] proj/android:master commit in: dev-util/soong/files/, dev-util/soong/
commit: d1ca40bebcfce840e313e462c1ed54c003887c6f Author: Benda Xu gentoo org> AuthorDate: Sun Aug 12 16:17:09 2018 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 12 16:17:09 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=d1ca40be dev-util/soong: remove sysroot specifications. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 3 +- dev-util/soong/files/soong-no-sysroot.patch | 73 + dev-util/soong/soong-.ebuild| 1 + 3 files changed, 76 insertions(+), 1 deletion(-) 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 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b 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-.ebuild 2235 BLAKE2B efaa432fd695b59851af050c259490e78c8621ea07636d4d2216581d25c0e068893537ff2481f9af198bb3393e71536fd67764f859d14082c40440153322a5be SHA512 627bdd454f463969bab5d3e7061eb353746882f204207bcae0d592eba806680321e850902dd816c19e5bbd3f5405a8a34c29011e9efb1566e59472fc58ce331a +EBUILD soong-.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 000..6b8a5d2 --- /dev/null +++ b/dev-util/soong/files/soong-no-sysroot.patch @@ -0,0 +1,73 @@ +Index: soong-/build/soong/cc/compiler.go +=== +--- soong-.orig/build/soong/cc/compiler.go soong-/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) + +-
[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 44013ded5230f5ddef9b6183678da7a69b0fa2c1 Author: Benda Xu gentoo org> AuthorDate: Sun Aug 12 08:31:20 2018 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 12 08:31:36 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=44013ded dev-util/soong: use gentoo host path for toolchain and helpers. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 7 +++--- dev-util/soong/files/soong-gentoo-host-bin.patch | 29 +++ dev-util/soong/files/soong-gentoo-toolchain.patch | 16 - dev-util/soong/files/soong-no-bootstrap.patch | 20 dev-util/soong/soong-.ebuild | 8 +-- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 9e97326..d3f485f 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,12 +1,13 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 AUX soong--bootstrap-clean.patch 1539 BLAKE2B 95c06e8242d4d2e7a65d0f5e25b77bfe8079edf71213be318465250c78a1869e0b9ac0a7bb7be8123f586d1150a86951fb30b021230f3e3857ecdbdadab61d63 SHA512 b08a6314e3bee2b6d3ee7fa60afe3678a61d08c4930f9e55a643cf3bbe3373fef08d245b048a03a246d9cb0f9b3974b7e1dcb3f44f614cd9fd7f062d5c096384 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 -AUX soong-gentoo-toolchain.patch 3081 BLAKE2B 9f13b1851f74289e0d0f0bff674a2dc9a33df2d99dff32781e6347567022b6b2815ac0ce77e622298c618e5cc145a15dd0dbe8e6f425dd1fac6dab75682a2589 SHA512 c01803d050527baedf358aa08db34f432019bf76cdfd3f78ddb1cf22c644ead9e368e77e269db99a6fbedf944d7b1b3d6d3120891108d6d268bde1b85c746a99 -AUX soong-no-bootstrap.patch 719 BLAKE2B 2d6bef0e256f4bf1c7bac48b1a725aaf53f061ec04b67dcc47a94fcb406cc32499557c9c97198748a904a6ab5e9a5ff4d375de2ca0f030deabe31e177795b8bd SHA512 05617b717c05eecd1b6971a4e72302341904a23481fccca83beb9b329ba91afda562b0d594600e2a91d784995dcf125fc71c955da60d0a1648128c71ec751c33 +AUX soong-gentoo-host-bin.patch 1141 BLAKE2B d15738ce12aeb54e63e2f540b992fb6ed1989dfbb53a1b53f8cb0a99b3d30be2ae8ce598fb37f13fd68053e1b2deae0a4e112ab243186bf656662484ae278ca2 SHA512 c6eda77f2f2db1c0fe9b2556966b3015bda409198766a22dfca73dfbca2ed944355e129570e626e1849ee00353a9f229678091f66fed4a61bc5b7e270e33169c +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 DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B cb2335fd766212d1c3279ae4d6ee91df5f3c3a9522230ca70cbc080eed9b387a7d567963ba8ea5ffc4a48b01400958cc1d619b9da897e0f90a29b4446becdf46 SHA512 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b 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 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5c
[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 4de6a23d3c0a0026328b67133ef4458d8835b9bc Author: Benda Xu gentoo org> AuthorDate: Sat Aug 11 08:06:39 2018 + Commit: Benda XU gentoo org> CommitDate: Sat Aug 11 08:06:39 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=4de6a23d dev-util/soong: remove strip wrappers. ship scripts like copygcclib.sh. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 4 +-- dev-util/soong/files/soong-gentoo-toolchain.patch | 33 --- dev-util/soong/soong-.ebuild | 1 + 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 3a27063..9e97326 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,12 +1,12 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 AUX soong--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-gentoo-toolchain.patch 3081 BLAKE2B 9f13b1851f74289e0d0f0bff674a2dc9a33df2d99dff32781e6347567022b6b2815ac0ce77e622298c618e5cc145a15dd0dbe8e6f425dd1fac6dab75682a2589 SHA512 c01803d050527baedf358aa08db34f432019bf76cdfd3f78ddb1cf22c644ead9e368e77e269db99a6fbedf944d7b1b3d6d3120891108d6d268bde1b85c746a99 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 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b 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-.ebuild 2066 BLAKE2B 4e6091f8df826ff182d1d6a947c811955657d8541b61a11a92b999c3256659f2592108194c96386d88722b7c73716a3b6cb9149df377c7ff55a968a9e39f58e2 SHA512 23e87473eb71d5b8bf8fbc397515109b9b73421ec834f5e896fe12d736f30d98763c91039edf0a14e1d34937f620c055d32ab40f14b73bccd5f61599f655e108 +EBUILD soong-.ebuild 2096 BLAKE2B 0c20f2a06591ccf03299b145b791b5ec26a10c6780faa1080c0ec81cbc4d45dc622fa3568c13712b35f006edac5557740b2d0e0b99ca72af9e37f7a02c7f6f0a SHA512 01bb0ad883c8d577ade15408a855e052f41ecb725374da81b0866f14039aa0529f504c4105794691bbfcdc734cfee6760c78bddf95f0253847b8a024cd792576 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63
[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 6acff0b8c46cc79f296b65eebd1588ebb7f6eca1 Author: Benda Xu gentoo org> AuthorDate: Sat Aug 11 07:16:36 2018 + Commit: Benda XU gentoo org> CommitDate: Sat Aug 11 07:16:36 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=6acff0b8 dev-util/soong: remove dependencies on prebuilt toolchain. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 5 +- dev-util/soong/files/soong-gentoo-toolchain.patch | 78 +++ dev-util/soong/soong-.ebuild | 3 +- 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--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 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b 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-.ebuild 2015 BLAKE2B c0e5661fcaa99f02177316e80d3dc94c8626425200ff035fbafcfd95779500b8778cdf5293fbe59a774363e1cf94d6e1886f78a399ba55ac43fb3a457368ea1a SHA512 19527b1876ed8fc50b905e185d984b056f49e788ce165ddeaefe490e012f74a17d80a853a0b09d588d3454e9f93481c0fb9249f2911f0cf60cbe61d08e4cdc3c +EBUILD soong-.ebuild 2066 BLAKE2B 4e6091f8df826ff182d1d6a947c811955657d8541b61a11a92b999c3256659f2592108194c96386d88722b7c73716a3b6cb9149df377c7ff55a968a9e39f58e2 SHA512 23e87473eb71d5b8bf8fbc397515109b9b73421ec834f5e896fe12d736f30d98763c91039edf0a14e1d34937f620c055d32ab40f14b73bccd5f61599f655e108 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff8
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: 8f10f28af4b28e64acc78df16f8d2d6a63031d45 Author: KireinaHoro jsteward moe> AuthorDate: Fri Aug 10 15:00:09 2018 + Commit: Pengcheng Xu jsteward moe> CommitDate: Fri Aug 10 15:00:09 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=8f10f28a dev-util/soong: rename lineage vendor distfile Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 4 ++-- dev-util/soong/soong-.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index adfeb92..1a7d1bc 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -4,8 +4,8 @@ AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f 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 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b -DIST lineage-15.1.tar.gz 49859612 BLAKE2B 2203f51a8610100c9b6e3754d54da0310414abfac60b21a7fb4739f8f70bfc81cf0f61fb820b82891fbaf4bc89162d2b891c9c75ef86abe61de91525b7cb5e61 SHA512 5f7f92cf310d45c51f687a84205a8de68390fd2462e754bbe8d7226041e19938614d4f68eafb046dbb34ad29c67d70cfa6a3bea98841935d2c1659a5ee7c90c9 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 EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68 SHA512 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca -EBUILD soong-.ebuild 1985 BLAKE2B 17de5d9d82e706c9f39d262f739d60af4d7252d3c859431ca4180fee2838156b2516dd9edc5ee982028453fdf358cdcbd00c8027d6e8baac85d441f74a56c56b SHA512 d1b1cc0aed74ce03af4a4859f804256206bc48a06cd1913e5e22d03d08f7a7e1ad6c385e1a4eda57b553c0dc2da83417b3fa7722298ebb9a8867f33bf73efb82 +EBUILD soong-.ebuild 2015 BLAKE2B c0e5661fcaa99f02177316e80d3dc94c8626425200ff035fbafcfd95779500b8778cdf5293fbe59a774363e1cf94d6e1886f78a399ba55ac43fb3a457368ea1a SHA512 19527b1876ed8fc50b905e185d984b056f49e788ce165ddeaefe490e012f74a17d80a853a0b09d588d3454e9f93481c0fb9249f2911f0cf60cbe61d08e4cdc3c MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/soong-.ebuild b/dev-util/soong/soong-.ebuild index f5078cd..da35cf9 100644 --- a/dev-util/soong/soong-.ebuild +++ b/dev-util/soong/soong-.ebuild @@ -11,7 +11,7 @@ A_URI=http://aosp.airelinux.org/platform/build # blueprint is a source level dependency of soong. MPV=8.1.0_p41 SRC_URI="${A_URI}/blueprint/+archive/android-${MPV/p/r}.tar.gz -> blueprint-${MPV}.tar.gz - https://github.com/LineageOS/android_vendor_lineage/archive/lineage-15.1.tar.gz"; + https://github.com/LineageOS/android_vendor_lineage/archive/lineage-15.1.tar.gz -> vendor-lineage-15.1.tar.gz" DESCRIPTION="JSON-like build system for Android." HOMEPAGE="${A_URI}/${PN}" LICENSE="Apache-2.0"
[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 3915d3281902c71dee53b9bc57466e532f510ad1 Author: Benda Xu gentoo org> AuthorDate: Fri Aug 10 12:37:23 2018 + Commit: Benda XU gentoo org> CommitDate: Fri Aug 10 12:37:23 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=3915d328 dev-util/soong: add soong- from KirenaHoro. Remove bootstrap recipe generator, because it is not needed after soong is built. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest| 4 ++ .../soong/files/soong--bootstrap-clean.patch | 57 + dev-util/soong/files/soong-no-bootstrap.patch | 12 dev-util/soong/soong-.ebuild | 71 ++ 4 files changed, 144 insertions(+) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index dbae562..adfeb92 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,7 +1,11 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 +AUX soong--bootstrap-clean.patch 1539 BLAKE2B 95c06e8242d4d2e7a65d0f5e25b77bfe8079edf71213be318465250c78a1869e0b9ac0a7bb7be8123f586d1150a86951fb30b021230f3e3857ecdbdadab61d63 SHA512 b08a6314e3bee2b6d3ee7fa60afe3678a61d08c4930f9e55a643cf3bbe3373fef08d245b048a03a246d9cb0f9b3974b7e1dcb3f44f614cd9fd7f062d5c096384 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 +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 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b +DIST lineage-15.1.tar.gz 49859612 BLAKE2B 2203f51a8610100c9b6e3754d54da0310414abfac60b21a7fb4739f8f70bfc81cf0f61fb820b82891fbaf4bc89162d2b891c9c75ef86abe61de91525b7cb5e61 SHA512 5f7f92cf310d45c51f687a84205a8de68390fd2462e754bbe8d7226041e19938614d4f68eafb046dbb34ad29c67d70cfa6a3bea98841935d2c1659a5ee7c90c9 DIST soong-8.1.0_p41.tar.gz 355543 BLAKE2B 0d2b47c30d0515426cffa19c73495f68633dcdbcd5fc33fbbabb8892b712eb85ec68657ea73e07b34573af525055c0f791cd6b54ca58dedd5c14bd4af1a37623 SHA512 50f65ac86f4466adfed6fddf6e8288e16fdc0c1717ba57e59d40395115d4f55ceed3407ce6542ef0173c2076783a7bdc908ff0aac6f19aad7c62a8f63daef6e3 EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68 SHA512 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca +EBUILD soong-.ebuild 1985 BLAKE2B 17de5d9d82e706c9f39d262f739d60af4d7252d3c859431ca4180fee2838156b2516dd9edc5ee982028453fdf358cdcbd00c8027d6e8baac85d441f74a56c56b SHA512 d1b1cc0aed74ce03af4a4859f804256206bc48a06cd1913e5e22d03d08f7a7e1ad6c385e1a4eda57b553c0dc2da83417b3fa7722298ebb9a8867f33bf73efb82 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/files/soong--bootstrap-clean.patch b/dev-util/soong/files/soong--bootstrap-clean.patch new file mode 100644 index 000..1f1eec6 --- /dev/null +++ b/dev-util/soong/files/soong--bootstrap-clean.patch @@ -0,0 +1,57 @@ +diff --git a/build/soong/bootstrap.bash b/build/soong/bootstrap.bash +index aedbe94..1eb864e 100755 +--- a/build/soong/bootstrap.bash b/build/soong/bootstrap.bash +@@ -1,16 +1,7 @@ + #!/bin/bash + +-set -e +- +-ORIG_SRCDIR=$(dirname "${BASH_SOURCE[0]}") +-if [[ "$ORIG_SRCDIR" != "." ]]; then +- if [[ ! -z "$BUILDDIR" ]]; then +-echo "error: To
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: d8601082c9ef4f781769a2b365e46957ca083bd5 Author: Benda Xu gentoo org> AuthorDate: Fri Aug 10 03:22:50 2018 + Commit: Benda XU gentoo org> CommitDate: Fri Aug 10 03:22:50 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=d8601082 dev-util/soong: distribute root.bp. This mocks the Android build system more closely. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 2 +- dev-util/soong/soong-8.1.0_p41.ebuild | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index fb9e44f..dbae562 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -3,5 +3,5 @@ AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B cb2335fd766212d1c3279ae4d6ee91df5f3c3a9522230ca70cbc080eed9b387a7d567963ba8ea5ffc4a48b01400958cc1d619b9da897e0f90a29b4446becdf46 SHA512 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b DIST soong-8.1.0_p41.tar.gz 355543 BLAKE2B 0d2b47c30d0515426cffa19c73495f68633dcdbcd5fc33fbbabb8892b712eb85ec68657ea73e07b34573af525055c0f791cd6b54ca58dedd5c14bd4af1a37623 SHA512 50f65ac86f4466adfed6fddf6e8288e16fdc0c1717ba57e59d40395115d4f55ceed3407ce6542ef0173c2076783a7bdc908ff0aac6f19aad7c62a8f63daef6e3 -EBUILD soong-8.1.0_p41.ebuild 1606 BLAKE2B e67a0f3bdad0b00ae79ea367bb430bc5a598843238d8c8c4bd9fa69baa86942fabc125f54ae833aa37a57f77194f15e19f3579705033c840c5fb87f5dcdc915a SHA512 5bf6928f0d84903ddba4b2b461127af6af45cc0ead533352026304a4dc1972be989cecb385778a10b92fb62c953da097a7c2114ac23a6cd26179302e600903ee +EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68 SHA512 da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/soong-8.1.0_p41.ebuild b/dev-util/soong/soong-8.1.0_p41.ebuild index 7f381cc..9d5c13a 100644 --- a/dev-util/soong/soong-8.1.0_p41.ebuild +++ b/dev-util/soong/soong-8.1.0_p41.ebuild @@ -58,6 +58,7 @@ src_install() { dobin out/.bootstrap/bin/* dodoc out/.bootstrap/docs/* sed -n '/\/\/.*host bionic/,$p' < build/soong/Android.bp > "${T}"/Android.bp + sed '/build = \[/,+3d' < build/soong/root.bp > "${T}"/root.bp insinto /usr/share/soong - doins "${T}"/Android.bp + doins "${T}"/{Android,root}.bp }
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: 83a02b13c74fbb392ec3caf8ec90fa175232ec3f Author: Benda Xu gentoo org> AuthorDate: Thu Aug 9 15:00:38 2018 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 9 15:00:38 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=83a02b13 dev-util/soong: use caching reverse proxy. The android source tarball is constantly changing. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 6 +++--- dev-util/soong/soong-8.1.0_p41.ebuild | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 387c72a..fb9e44f 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,7 +1,7 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be -DIST blueprint-8.1.0_p41.tar.gz 114220 BLAKE2B 9b8bc418a718cda7c2a83cabcdc4945a1c1b7272a0c2e3ea5e50c3b0df9b64565583a50a807947479499f6bd90518ee9f10625bed5a2eab4bd001a44b132fc11 SHA512 9f94bca7e60197089febb22d182d269a154c9c77f5204a4ba9e7d2e9591d577d1bcb446b4aeacc0ac4d14848eecb2c8e6b1ab5c2af355d6d8d8f96e2d17c96a2 -DIST soong-8.1.0_p41.tar.gz 355525 BLAKE2B 6d835edc62f4bd5bfefc20242c48da3afed2a611dc5f4536da318c933bde81ffdca9ef026b047e8e7db8a8fb25e27e0a123ba6e0bdba77ce87c2c08343eb4384 SHA512 a527a4e0b851f2260c09c4e78c252a84353b3af4daf195b4507a68fdd9a7d19f413be8f7c593e0916a8bf32cef490119ad314a3e3eaeac366c9fcfbb42464d07 -EBUILD soong-8.1.0_p41.ebuild 1613 BLAKE2B c23df24920589ea001d7592c36443608ca4d4095fd07fee2c391bdc50224f5797631a0734a3f2c85aaee2eb7519a1d289b5db04c7c3864aab41833849b795a82 SHA512 24d4448c39501db07335dc841a81ba4f65a361623f8a001c2d7ad291a388b86a61143cd58dfded024e059f53109cd71fc4a6be8f69e144d9d1b3b483cfd977c6 +DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B cb2335fd766212d1c3279ae4d6ee91df5f3c3a9522230ca70cbc080eed9b387a7d567963ba8ea5ffc4a48b01400958cc1d619b9da897e0f90a29b4446becdf46 SHA512 8ada4f309767567e7e08e6c8e61f0e442eb14a5923bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b +DIST soong-8.1.0_p41.tar.gz 355543 BLAKE2B 0d2b47c30d0515426cffa19c73495f68633dcdbcd5fc33fbbabb8892b712eb85ec68657ea73e07b34573af525055c0f791cd6b54ca58dedd5c14bd4af1a37623 SHA512 50f65ac86f4466adfed6fddf6e8288e16fdc0c1717ba57e59d40395115d4f55ceed3407ce6542ef0173c2076783a7bdc908ff0aac6f19aad7c62a8f63daef6e3 +EBUILD soong-8.1.0_p41.ebuild 1606 BLAKE2B e67a0f3bdad0b00ae79ea367bb430bc5a598843238d8c8c4bd9fa69baa86942fabc125f54ae833aa37a57f77194f15e19f3579705033c840c5fb87f5dcdc915a SHA512 5bf6928f0d84903ddba4b2b461127af6af45cc0ead533352026304a4dc1972be989cecb385778a10b92fb62c953da097a7c2114ac23a6cd26179302e600903ee MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/soong-8.1.0_p41.ebuild b/dev-util/soong/soong-8.1.0_p41.ebuild index eed329d..7f381cc 100644 --- a/dev-util/soong/soong-8.1.0_p41.ebuild +++ b/dev-util/soong/soong-8.1.0_p41.ebuild @@ -5,7 +5,7 @@ EAPI=6 inherit ninja-utils -A_URI=https://android.googlesource.com/platform/build +A_URI=http://aosp.airelinux.org/platform/build # blueprint is a source level dependency of soong. SRC_URI="${A_URI}/${PN}/+archive/android-${PV/p/r}.tar.gz -> ${P}.tar.gz
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: 6734286af5acc90a8f846aec1a5f49a479a02e6c Author: Benda Xu gentoo org> AuthorDate: Thu Aug 9 12:56:17 2018 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 9 12:56:17 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=6734286a dev-util/soong: use cleaner SRC_URI. Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/soong/Manifest | 6 +++--- dev-util/soong/soong-8.1.0_p41.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 4151601..387c72a 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,7 +1,7 @@ AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be -DIST blueprint-8.1.0_p41.tar.gz 114223 BLAKE2B c2e0c450fc6bd6b92dfcdeb5f80462e0edb65a2c052beb29d0a8d6b5dbaa92e54f2c402b964acffe733d58926abe4d2ad3c5891ad751f7eab0c8e5ee8ba4d9b8 SHA512 4799d4e6edcb9a5088a427fad39b0641455806e808457d33b2f78d2c22b14004804b4f62a35a75087be799b05e69f8aa171747a90e53eb894f36937acd32343c -DIST soong-8.1.0_p41.tar.gz 355567 BLAKE2B aeafa2f29e270bde985ff52a2c3c12507f6c2aba37013c14139cc5c8336ac15305f6aa8182799dea0e744355efdf83a331ce4db10e8551a5b2e5efb140c2a592 SHA512 90675ad4623bba3d3fd20620d3a5a42b63c67bc48ade17da5e661ad8cedab31e2cc41a46bac181ebd49a24f0bfb9cfc07857e312a3f7d80458e361311a354245 -EBUILD soong-8.1.0_p41.ebuild 1659 BLAKE2B 19cc439751509137dd83a291bd9c8a8e21e64f6c3577e4309eb9cf4236c98874b6712be2ca1231f0f96518aecd18f72517b9e31fb4128b74f802ff37f67adac5 SHA512 1e2453aa1ec4a3738b1f64ae561add3adbb8da313106b5422be77f9e4aab6731f2a67dac0c504b62cbe51344ee0419da4f4ce44b7efca0f69689103772826748 +DIST blueprint-8.1.0_p41.tar.gz 114220 BLAKE2B 9b8bc418a718cda7c2a83cabcdc4945a1c1b7272a0c2e3ea5e50c3b0df9b64565583a50a807947479499f6bd90518ee9f10625bed5a2eab4bd001a44b132fc11 SHA512 9f94bca7e60197089febb22d182d269a154c9c77f5204a4ba9e7d2e9591d577d1bcb446b4aeacc0ac4d14848eecb2c8e6b1ab5c2af355d6d8d8f96e2d17c96a2 +DIST soong-8.1.0_p41.tar.gz 355525 BLAKE2B 6d835edc62f4bd5bfefc20242c48da3afed2a611dc5f4536da318c933bde81ffdca9ef026b047e8e7db8a8fb25e27e0a123ba6e0bdba77ce87c2c08343eb4384 SHA512 a527a4e0b851f2260c09c4e78c252a84353b3af4daf195b4507a68fdd9a7d19f413be8f7c593e0916a8bf32cef490119ad314a3e3eaeac366c9fcfbb42464d07 +EBUILD soong-8.1.0_p41.ebuild 1613 BLAKE2B c23df24920589ea001d7592c36443608ca4d4095fd07fee2c391bdc50224f5797631a0734a3f2c85aaee2eb7519a1d289b5db04c7c3864aab41833849b795a82 SHA512 24d4448c39501db07335dc841a81ba4f65a361623f8a001c2d7ad291a388b86a61143cd58dfded024e059f53109cd71fc4a6be8f69e144d9d1b3b483cfd977c6 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/soong-8.1.0_p41.ebuild b/dev-util/soong/soong-8.1.0_p41.ebuild index 27e17ef..eed329d 100644 --- a/dev-util/soong/soong-8.1.0_p41.ebuild +++ b/dev-util/soong/soong-8.1.0_p41.ebuild @@ -8,8 +8,8 @@ inherit ninja-utils A_URI=https://android.googlesource.com/platform/build # blueprint is a source level dependency of soong. -SRC_URI="${A_URI}/${PN}/+archive/3d83ebe1768d676c90e8fa3d508157f4654821e5.tar.gz -> ${P}.tar.gz - ${A_URI}/blueprint/+archive/a011038d864e3faa528ec1037a568e5824955a0f.tar.gz -> blueprint-${PV}.tar.gz" +SRC_URI="${A_URI}/${PN}/+archive/android-${PV/p/r}.tar.gz -> ${P}.tar.gz + ${A_URI}/blueprint/+archive/android-${PV/p/r}.tar.gz -> blueprint-${PV}.tar.gz" DESCRIPTION="JSON-like build system for Android." HOMEPAGE="${A_URI}/${PN}" LICENSE="Apache-2.0"
[gentoo-commits] proj/android:master commit in: dev-util/soong/, dev-util/soong/files/
commit: 0f8ab56e4acf493ff706433ef460963b718f33ea Author: Benda Xu gentoo org> AuthorDate: Thu Aug 9 05:34:49 2018 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 9 05:34:49 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=0f8ab56e Ship the patches and common Android.bp. dev-util/soong/Manifest | 5 +- dev-util/soong/files/blueprint-test-go-1.10.patch | 64 +++ dev-util/soong/files/soong-bootstrap-clean.patch | 57 dev-util/soong/files/soong-no-kernel-header.patch | 13 + dev-util/soong/soong-8.1.0_p41.ebuild | 11 +++- 5 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest index 13b5d25..4151601 100644 --- a/dev-util/soong/Manifest +++ b/dev-util/soong/Manifest @@ -1,4 +1,7 @@ +AUX blueprint-test-go-1.10.patch 1533 BLAKE2B 3f764ea5ac68cdce8ecadb0dc40f4e676d8db21095b88cf99d7aa6c950ffd578029782d075d59290fc4898544458cab730471f9f0581dccefccc5a2951aa7234 SHA512 2846a098840b4543ec34466d5e97d0f6f8b05ba8dbb01e23c4a802a2bc3995fbb64020e88fa49ded8d7cac527cbfbb5614447165f7f17b392925f4f02556d480 +AUX soong-bootstrap-clean.patch 1588 BLAKE2B ec20e7fece7c126a19586d1a6db7264f64f2b427c7386a6a9f2df77d5171a024185e119683ae2d5e87f483937bc05d40b6d3ffd4132826ff7e42448348d96e75 SHA512 bb39af5fd5d8ec310506b8a3bb782389e9a3c4a31429d6cf32f4681b5fee64d41c01ecf05f692060bcf15ff53952a31d1d6ffe2ee4de6a6e65ee8f44cca42972 +AUX soong-no-kernel-header.patch 346 BLAKE2B 9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2 SHA512 b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be DIST blueprint-8.1.0_p41.tar.gz 114223 BLAKE2B c2e0c450fc6bd6b92dfcdeb5f80462e0edb65a2c052beb29d0a8d6b5dbaa92e54f2c402b964acffe733d58926abe4d2ad3c5891ad751f7eab0c8e5ee8ba4d9b8 SHA512 4799d4e6edcb9a5088a427fad39b0641455806e808457d33b2f78d2c22b14004804b4f62a35a75087be799b05e69f8aa171747a90e53eb894f36937acd32343c DIST soong-8.1.0_p41.tar.gz 355567 BLAKE2B aeafa2f29e270bde985ff52a2c3c12507f6c2aba37013c14139cc5c8336ac15305f6aa8182799dea0e744355efdf83a331ce4db10e8551a5b2e5efb140c2a592 SHA512 90675ad4623bba3d3fd20620d3a5a42b63c67bc48ade17da5e661ad8cedab31e2cc41a46bac181ebd49a24f0bfb9cfc07857e312a3f7d80458e361311a354245 -EBUILD soong-8.1.0_p41.ebuild 1379 BLAKE2B 0e890c7433c4f1947545f30991cab1906cc1e44cc2bc024c57f122e9e46a509313bb973ef22809984376b71eb630f2066130b5cd2ffb0396d32527ff1d22 SHA512 4dffe8c8bdc706867616e79b89de5f5b5017658984a9119a7fdd150257e554bc69b5162c03ee998b805b44317c87d98536d59366bd70f21fecd728d481125086 +EBUILD soong-8.1.0_p41.ebuild 1659 BLAKE2B 19cc439751509137dd83a291bd9c8a8e21e64f6c3577e4309eb9cf4236c98874b6712be2ca1231f0f96518aecd18f72517b9e31fb4128b74f802ff37f67adac5 SHA512 1e2453aa1ec4a3738b1f64ae561add3adbb8da313106b5422be77f9e4aab6731f2a67dac0c504b62cbe51344ee0419da4f4ce44b7efca0f69689103772826748 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/files/blueprint-test-go-1.10.patch b/dev-util/soong/files/blueprint-test-go-1.10.patch new file mode 100644 index 000..23b7caa --- /dev/null +++ b/dev-util/soong/files/blueprint-test-go-1.10.patch @@ -0,0 +1,64 @@ +Index: soong-8.1.0_p41/build/blueprint/gotestmain/gotestmain.go +=== +--- soong-8.1.0_p41.orig/build/blueprint/gotestmain/gotestmain.go soong-8.1.0_p41/build/blueprint/gotestmain/gotestmain.go +@@ -105,12 +105,11 @@ var testMainTmpl = template.Must(templat + package main + + import ( +- "io" + {{if not .HasMain}} + "os" + {{end}} +- "regexp" + "testing" ++ "testing/internal/testdeps" + + pkg "{{.Package}}" + ) +@@ -121,44 +120,9 @@ var t = []testing.InternalTest{ + {{end}} + } + +-var matchPat string +-var matchRe *regexp.Regexp +- +-type matchString struct{} +- +-func MatchString(pat, str string) (result bool, err error) { +- if matchRe == nil || matchPat != pat { +- matchPat = pat +- matchRe, err = regexp.Compile(matchPat) +- if err != nil { +- return +- } +- } +- return matchRe.MatchString(str), nil +-} +- +-func (matchString) MatchString(pat, str string) (bool, error) { +- return MatchString(pat, str) +-} +- +-func (matchString) StartCPUProfile(w io.Writer) error { +- panic("shouldn't get here") +-} +- +-func (matchString) StopCPUProfile() { +-} +- +-func (matchString) WriteHeapProfile(w io.Writer) error { +-panic("shouldn't get here") +-}
[gentoo-commits] proj/android:master commit in: dev-util/soong/
commit: 54da45a46cc33c2c37a5a7943a66b9287605b83b Author: Benda Xu gentoo org> AuthorDate: Thu Aug 9 04:16:50 2018 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 9 04:16:50 2018 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=54da45a4 Add soong, the android build system. dev-util/soong/Manifest | 4 +++ dev-util/soong/metadata.xml | 8 ++ dev-util/soong/soong-8.1.0_p41.ebuild | 54 +++ 3 files changed, 66 insertions(+) diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest new file mode 100644 index 000..13b5d25 --- /dev/null +++ b/dev-util/soong/Manifest @@ -0,0 +1,4 @@ +DIST blueprint-8.1.0_p41.tar.gz 114223 BLAKE2B c2e0c450fc6bd6b92dfcdeb5f80462e0edb65a2c052beb29d0a8d6b5dbaa92e54f2c402b964acffe733d58926abe4d2ad3c5891ad751f7eab0c8e5ee8ba4d9b8 SHA512 4799d4e6edcb9a5088a427fad39b0641455806e808457d33b2f78d2c22b14004804b4f62a35a75087be799b05e69f8aa171747a90e53eb894f36937acd32343c +DIST soong-8.1.0_p41.tar.gz 355567 BLAKE2B aeafa2f29e270bde985ff52a2c3c12507f6c2aba37013c14139cc5c8336ac15305f6aa8182799dea0e744355efdf83a331ce4db10e8551a5b2e5efb140c2a592 SHA512 90675ad4623bba3d3fd20620d3a5a42b63c67bc48ade17da5e661ad8cedab31e2cc41a46bac181ebd49a24f0bfb9cfc07857e312a3f7d80458e361311a354245 +EBUILD soong-8.1.0_p41.ebuild 1379 BLAKE2B 0e890c7433c4f1947545f30991cab1906cc1e44cc2bc024c57f122e9e46a509313bb973ef22809984376b71eb630f2066130b5cd2ffb0396d32527ff1d22 SHA512 4dffe8c8bdc706867616e79b89de5f5b5017658984a9119a7fdd150257e554bc69b5162c03ee998b805b44317c87d98536d59366bd70f21fecd728d481125086 +MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/dev-util/soong/metadata.xml b/dev-util/soong/metadata.xml new file mode 100644 index 000..c080f1d --- /dev/null +++ b/dev-util/soong/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + hero...@gentoo.org + Benda Xu + + diff --git a/dev-util/soong/soong-8.1.0_p41.ebuild b/dev-util/soong/soong-8.1.0_p41.ebuild new file mode 100644 index 000..c2a4f9e --- /dev/null +++ b/dev-util/soong/soong-8.1.0_p41.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit ninja-utils + +A_URI=https://android.googlesource.com/platform/build + +# blueprint is a source level dependency of soong. +SRC_URI="${A_URI}/${PN}/+archive/3d83ebe1768d676c90e8fa3d508157f4654821e5.tar.gz -> ${P}.tar.gz + ${A_URI}/blueprint/+archive/a011038d864e3faa528ec1037a568e5824955a0f.tar.gz -> blueprint-${PV}.tar.gz" +DESCRIPTION="JSON-like build system for Android." +HOMEPAGE="${A_URI}/${PN}" +LICENSE="Apache-2.0" +KEYWORDS="~amd64" +SLOT=0 + +DEPEND="dev-lang/go + dev-util/ninja" +RDEPEND="dev-lang/go" + +src_unpack() { + mkdir -p "${WORKDIR}"/${P}/build || die + cd "${WORKDIR}"/${P}/build || die + + for a in ${A}; do + mkdir ${a/-*//} || die + pushd ${a/-*//} > /dev/null || die + unpack ${a} + popd > /dev/null || die + done +} + +src_prepare() { + default + ln -s build/soong/root.bp Android.bp || die + ln -s build/soong/bootstrap.bash +} + +src_compile() { + BUILDDIR="${S}"/out bash -xv build/soong/bootstrap.bash || die + eninja -v -f out/.minibootstrap/build.ninja + eninja -v -f out/.bootstrap/build.ninja + + # go run cmd/microfactory/microfactory.go -s cmd/microfactory \ + #-pkg-path android/soong=. -o out/soong_ui android/soong/cmd/soong_ui + # eninja -v -f .bootstrap/build.ninja +} + +src_install() { + dobin out/.bootstrap/bin/* + dodoc out/.bootstrap/docs/* +}