commit: 095fbdbb6f191d8d55b838023395651b2b2befc9 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon May 25 09:20:51 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon May 25 09:22:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=095fbdbb
sys-libs/musl: use CFLAGS,CPPFLAGS,LDFLAGS, bug #595950 Reported-by: Laine Gholson Closes: https://bugs.gentoo.org/595950 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-libs/musl/{musl-9999.ebuild => musl-1.2.0-r1.ebuild} | 11 +++++++---- sys-libs/musl/musl-9999.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.0-r1.ebuild similarity index 92% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.2.0-r1.ebuild index dc422c9426b..170c94aedcf 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.2.0-r1.ebuild @@ -17,7 +17,7 @@ else https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c"; - KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" fi export CBUILD=${CBUILD:-${CHOST}} @@ -79,9 +79,12 @@ src_compile() { emake if [[ ${CATEGORY} != cross-* ]] ; then - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${DISTDIR}" fi } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index dc422c9426b..170c94aedcf 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -17,7 +17,7 @@ else https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c"; - KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" fi export CBUILD=${CBUILD:-${CHOST}} @@ -79,9 +79,12 @@ src_compile() { emake if [[ ${CATEGORY} != cross-* ]] ; then - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${DISTDIR}" fi }
