commit: 9188802088bd9616e71d23dce350f5a278b6f686
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 00:36:53 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 00:37:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91888020
sys-libs/musl: iconv, getent and getconf
Package-Manager: portage-2.2.28
sys-libs/musl/Manifest | 3 ++
.../{musl-9999.ebuild => musl-1.1.14-r1.ebuild} | 32 ++++++++++++----------
sys-libs/musl/musl-9999.ebuild | 32 ++++++++++++----------
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index ffea79c..052ec7f 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1,5 @@
+DIST getconf.c 11614 SHA256
d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c SHA512
0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
WHIRLPOOL
279170a21cd6d5b560b0c834236acf4989f1a7f5e9ecf9d7e594abc21b65f8aeb26a26475c49f4052d5f9b4f9d95032d22b1790dbd99e3f55c3677eb9fc6df8b
+DIST getent.c 9438 SHA256
68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe SHA512
b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
WHIRLPOOL
473e54a9158e70c411f4c84e590bcfd245051212a3346a3c6dd45df9f09a5fbccbc8900ad7f8691eb5ebb8cd1002caf9519abaffb1753175d4f8acb1d32236b4
+DIST iconv.c 2577 SHA256
f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512
9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
WHIRLPOOL
8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc
DIST musl-1.1.12.tar.gz 918757 SHA256
720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512
7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70
WHIRLPOOL
cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
DIST musl-1.1.14.tar.gz 894971 SHA256
35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 SHA512
9016246b44a7e6ef51477f0a246373c79f3e796c70031c3323be1b6c4c0518a2d4578f1aa712adfd9a80cdc1d71918bd7a35855052a0452b854755bf0cc2424e
WHIRLPOOL
e675ed13888021376812c65addf245906bfca00c5291ca5979cb4894cbe72b3a1b69c0fd793bd49f9cef2154131f717b15b52398b43c68fcfb7c5530b1258e72
diff --git a/sys-libs/musl/musl-9999.ebuild
b/sys-libs/musl/musl-1.1.14-r1.ebuild
similarity index 80%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.1.14-r1.ebuild
index 85bdc9b..bf1ebe9 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.1.14-r1.ebuild
@@ -2,12 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
+ SRC_URI="
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c";
+ KEYWORDS=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c";
+ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -20,18 +31,10 @@ fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance
and safety"
HOMEPAGE="http://www.musl-libc.org/";
-if [[ ${PV} != "9999" ]] ; then
- PATCH_VER=""
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz";
- KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crosscompile_opts_headers-only"
-RDEPEND="!sys-apps/getent"
-
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
@@ -63,10 +66,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- epatch_user
-}
-
src_configure() {
tc-getCC ${CTARGET}
just_headers && export CC=true
@@ -85,6 +84,9 @@ src_compile() {
just_headers && return 0
emake
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv
}
src_install() {
@@ -114,7 +116,9 @@ src_install() {
into /
dosbin "${T}"/ldconfig
into /usr
- dobin "${FILESDIR}"/getent
+ dosbin "${T}"/getconf
+ dosbin "${T}"/getent
+ dosbin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl ||
die
doenvd "${T}"/00musl || die
fi
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 85bdc9b..bf1ebe9 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -2,12 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
+ SRC_URI="
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c";
+ KEYWORDS=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c";
+ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -20,18 +31,10 @@ fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance
and safety"
HOMEPAGE="http://www.musl-libc.org/";
-if [[ ${PV} != "9999" ]] ; then
- PATCH_VER=""
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz";
- KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crosscompile_opts_headers-only"
-RDEPEND="!sys-apps/getent"
-
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
@@ -63,10 +66,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- epatch_user
-}
-
src_configure() {
tc-getCC ${CTARGET}
just_headers && export CC=true
@@ -85,6 +84,9 @@ src_compile() {
just_headers && return 0
emake
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv
}
src_install() {
@@ -114,7 +116,9 @@ src_install() {
into /
dosbin "${T}"/ldconfig
into /usr
- dobin "${FILESDIR}"/getent
+ dosbin "${T}"/getconf
+ dosbin "${T}"/getent
+ dosbin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl ||
die
doenvd "${T}"/00musl || die
fi
