sys-libs/bionic: port to glibc-2.26.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

3 files changed, 28 insertions, 6 deletions

diff --git a/sys-libs/bionic/Manifest b/sys-libs/bionic/Manifest
index 2ec0983..79f2b9c 100644
--- a/sys-libs/bionic/Manifest
+++ b/sys-libs/bionic/Manifest
@@ -1,4 +1,5 @@
 AUX amd64-soong.variables 1816 BLAKE2B 1e9517739ddb81abf79643dbc0dd5d9431a43dcd94d28f8cc75f1ba13961768a882379bda3b58dba3c290010e8b64a2d4e63497080561fe84fb0ccd2e80695bc SHA512 97f9bddd86c228c75a53ece728b44fb890d737dc2ef422ae7c074169f657e66e084523d7efbb5f0eb37823a2a58e8bfb4aa66e09b5e2a6c6f3be1ff114dec0c5
+AUX bionic-glibc-port.patch 1103 BLAKE2B 5459570f68469ac854735103474ff94097183dafe25d82beae968ff265be32df1c3dd8f0607ef4e44572ac5dc5ebb0e6a9dab1a7f6f7b3887cf792f59bb4916d SHA512 f84f613dad932d42170247d8754fea43825a064c1f5689a0f9fd889a925606eb388e44dbd8c89132641fbfeab4d759ef48d5df7ecef42b933f8ac7477538711a
 DIST bionic-8.1.0_p41.tar.gz 3517518 BLAKE2B 4c5121cda0e3562b3b65d8e7fa621c6e231973077d582b7d4abf861d03533fd4881901bd48ec971d5baaf155dc8f1a92eb62068a910199fa751fb3001d20d0ba SHA512 b110b46e9f67174f8f30f3b8da0e0fa02c42f2dbb5ced6a9ba9ad948d6cd0a82c1850e8a8d4cd5f3b81ad286e9eb400236fb5320ab02b72f44a0510829cd3e6d
 DIST build-8.1.0_p41.tar.gz 2587534 BLAKE2B 5a0eb0dab1d41c60b8eb2e14c5f6e82584ed57e63541fcfc1087f841d8206bb45302b341cff5754ca641e392ed3cccca7ab4609932620fe100aba37ff61679b1 SHA512 a4b0f24800055cc9e433b578c9e1ae7f511959512459cb916b63fd3ec9312fe272858117f15beea28a60464a04fd8fd17a7bfb6772b346edecfb387aad89a97d
 DIST compiler-rt-8.1.0_p41.tar.gz 2377259 BLAKE2B 09104aba4ef1dc9ce18609cae395f3849d3df6dbb9b9759c3a1532759afd52d7af37475df21ae2db3bbea0891f9974785833405c3731d0082e749c304a86bc89 SHA512 9472ca3fed7a0215f6bd7506f5ba722891c65f9a88a4296c57a69bd038854ad416b7ce433d11451408c632ec23b3f19c4a3fc6373a7955c27563d7786301b6de
@@ -11,5 +12,5 @@ DIST libunwind_llvm-8.1.0_p41.tar.gz 90999 BLAKE2B 3ebd73a228513548ee9f6f84ab221
 DIST lzma-8.1.0_p41.tar.gz 733693 BLAKE2B 733b0995778adce01af50b9f22276ec4a54d3c73ff7b9709a6b3c0327dd89c0a785cb991dbd3343e4e7b9c5eb9009afaea3d78db993a48e1dcbaa9807fdaf7ff SHA512 4cebceabb9096c19ccf3ab25ef27d4ce6f1655e431c6381f888345613f310509864135bc0ee7fd78dc5f1170521effea2113f149e71cca56a07254566755c0c5
 DIST safe-iop-8.1.0_p41.tar.gz 10800 BLAKE2B 02959e9a0f02259362bfbe840eae50bdfa429b09de8f56f8beec2f99697eabb4a0a71a175a79a52f943facded257a68bff383a53acbe61249b76fe2ff95911e1 SHA512 8b717408601194b76a6a44fec5bd62ff2121b89f5f8fea7b3eee7ca46c122e346f8d73d92f5b34575318b1015e74186affda1e1aca7b53ac9c3c303d4e8e7710
 DIST zlib-8.1.0_p41.tar.gz 607311 BLAKE2B b175cf9d4548df24cfd587abea62ee4c3dcee56f6a68b4044c4b1419be148ab4542c42cb19ce0d773b247ceaf3193afca385170674c9d6d2f92a4df8f6d346ba SHA512 0d587729c1210ee6efa6bb7cdac723da71a9c56252be67f6973e80c3597dbb7f2c96ea093078e580d97709de5e8d8fabf92aae0594f382b95e2d9559e43953d2
-EBUILD bionic-8.1.0_p41.ebuild 2538 BLAKE2B ccb4d80d472569363e5f917c30184212fd4c7458cf562e0271469ecd36d32ba1a0820c258eca3f32fcf7f20b00b34fb8e3b7278a54f2fd98be0e9f1bc3e2dbc2 SHA512 e9fe07a0de93a185d63b9ee1a811aacb0ff1ca70a487a41aa20739258bf10c6b98e3de78b231498f82cc75f844a89f7939997b0c479edea4e1f07920f021ef81
+EBUILD bionic-8.1.0_p41.ebuild 2514 BLAKE2B f42b461e16eb666a1c9165642f3d9e8f0e0c89fbe1245f0c4e2b85ccaebdd693566bfafec6c8477f379c59e304d3747bf1f98e43ad6a793b76e690e79671786e SHA512 85879143e1e44943094737d9a4d615864fbfaa563946118c63642031d800628f71032c39bac4faddfc9f6b8c3d499635729d1e3997342661e9f795cea27530f2
 MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21
diff --git a/sys-libs/bionic/bionic-8.1.0_p41.ebuild b/sys-libs/bionic/bionic-8.1.0_p41.ebuild
index e28615e..434bff6 100644
--- a/sys-libs/bionic/bionic-8.1.0_p41.ebuild
+++ b/sys-libs/bionic/bionic-8.1.0_p41.ebuild
@@ -20,6 +20,8 @@ LICENSE="Apache-2.0"
 
 DEPEND="dev-util/soong"
 
+PATCHES=( "${FILESDIR}"/bionic-glibc-port.patch )
+
 src_unpack() {
 	for m in ${SM[@]}; do
 		mkdir -p ${P}/${m} || die
@@ -36,11 +38,6 @@ src_prepare() {
 	rm -r ${PN}/{tests,tools,benchmarks,libc/malloc_debug} build/tools/acp || die
 
 	cp "${EPREFIX}"/usr/share/soong/root.bp Android.bp || die
-	cat >> Android.bp <<EOF || die
-cc_defaults {
-	name: "llvm-defaults"
-}
-EOF
 	ln -s "${EPREFIX}"/usr/share/soong build || die
 
 	# Remove ndk libraries. But keep ndk headers, because they are the
diff --git a/sys-libs/bionic/files/bionic-glibc-port.patch b/sys-libs/bionic/files/bionic-glibc-port.patch
new file mode 100644
index 0000000..c1baaed
--- /dev/null
+++ b/sys-libs/bionic/files/bionic-glibc-port.patch
@@ -0,0 +1,24 @@
+Index: bionic-8.1.0_p41/system/core/libbacktrace/include/backtrace/Backtrace.h
+===================================================================
+--- bionic-8.1.0_p41.orig/system/core/libbacktrace/include/backtrace/Backtrace.h
++++ bionic-8.1.0_p41/system/core/libbacktrace/include/backtrace/Backtrace.h
+@@ -68,7 +68,6 @@ struct __darwin_ucontext;
+ typedef __darwin_ucontext ucontext_t;
+ #else
+ struct ucontext;
+-typedef ucontext ucontext_t;
+ #endif
+ 
+ struct backtrace_stackinfo_t {
+Index: bionic-8.1.0_p41/external/libcxx/include/__locale
+===================================================================
+--- bionic-8.1.0_p41.orig/external/libcxx/include/__locale
++++ bionic-8.1.0_p41/external/libcxx/include/__locale
+@@ -36,7 +36,6 @@
+ # include <support/newlib/xlocale.h>
+ #elif (defined(__GLIBC__) || defined(__APPLE__)      || defined(__FreeBSD__) \
+     || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
+-# include <xlocale.h>
+ #elif defined(_LIBCPP_HAS_MUSL_LIBC)
+ # include <support/musl/xlocale.h>
+ #endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__