summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-06-29 20:41:36 -0700
committerZac Medico <zmedico@gentoo.org>2020-06-29 20:51:09 -0700
commit65aac3a0d26254abf858e82eab4329f0a4d4b402 (patch)
tree6b46495ece64bf853a085f5e1f1c479679fada5a /dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
parentmedia-libs/cimg: remove old (diff)
downloadgentoo-65aac3a0d26254abf858e82eab4329f0a4d4b402.tar.gz
gentoo-65aac3a0d26254abf858e82eab4329f0a4d4b402.tar.bz2
gentoo-65aac3a0d26254abf858e82eab4329f0a4d4b402.zip
dev-util/android-tools: support -fno-common (bug 706946)
Add -fno-common patch by Peter Levine. Closes: https://bugs.gentoo.org/706946 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild')
-rw-r--r--dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 67c0ac57ad6e..47c2fc39aa44 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -26,7 +26,8 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
- https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}"
+ https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}
+ https://dev.gentoo.org/~zmedico/dist/${P}-bug-706946-fno-common.patch.xz"
# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
LICENSE="Apache-2.0 BSD-2"
@@ -71,6 +72,8 @@ src_unpack() {
unpack "${MY_P}.ninja.xz"
mv "${MY_P}.ninja" "build.ninja" || die
+ unpack "${P}-bug-706946-fno-common.patch.xz"
+
# Avoid depending on gtest just for its prod headers when boringssl bundles it.
ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
}
@@ -97,7 +100,8 @@ src_prepare() {
-i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
cd "${S}" || die
- default
+
+ eapply "${WORKDIR}/${P}-bug-706946-fno-common.patch"
sed -E \
-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \