blueness 15/04/15 23:10:51 Modified: musl-9999.ebuild ChangeLog Added: musl-1.1.8-r1.ebuild Log: Merge with sys-apps/getent. Add ldconfig. Bug #545006. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.18 sys-libs/musl/musl-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?r1=1.17&r2=1.18 Index: musl-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- musl-9999.ebuild 30 Mar 2015 23:31:59 -0000 1.17 +++ musl-9999.ebuild 15 Apr 2015 23:10:51 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.17 2015/03/30 23:31:59 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.18 2015/04/15 23:10:51 blueness Exp $ EAPI=5 @@ -26,13 +26,11 @@ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" fi -LICENSE="MIT" +LICENSE="MIT LGPL-2 GPL-2" SLOT="0" IUSE="crosscompile_opts_headers-only" -if [[ ${CATEGORY} != cross-* ]] ; then - RDEPEND+=" sys-apps/getent" -fi +RDEPEND="!sys-apps/getent" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] @@ -84,6 +82,13 @@ is_crosscompile && sysroot=/usr/${CTARGET} local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd + + if [[ ${CATEGORY} != cross-* ]] ; then + into /usr + dobin "${FILESDIR}"/getent + into / + dosbin "${FILESDIR}"/ldconfig + fi } pkg_postinst() { @@ -91,8 +96,6 @@ [ "${ROOT}" != "/" ] && return 0 - # TODO: musl doesn't use ldconfig, instead here we can - # create sym links to libraries outside of /lib and /usr/lib ldconfig # reload init ... /sbin/telinit U 2>/dev/null 1.51 sys-libs/musl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.51&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.51&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?r1=1.50&r2=1.51 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 1 Apr 2015 20:04:37 -0000 1.50 +++ ChangeLog 15 Apr 2015 23:10:51 -0000 1.51 @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/musl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.50 2015/04/01 20:04:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.51 2015/04/15 23:10:51 blueness Exp $ + +*musl-1.1.8-r1 (15 Apr 2015) + + 15 Apr 2015; Anthony G. Basile <[email protected]> +files/getent, + +files/ldconfig, +musl-1.1.8-r1.ebuild, musl-9999.ebuild: + Merge with sys-apps/getent. Add ldconfig. Bug #545006. 01 Apr 2015; Anthony G. Basile <[email protected]> musl-1.1.8.ebuild: Mark stable on all musl arches. 1.1 sys-libs/musl/musl-1.1.8-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.8-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.8-r1.ebuild?rev=1.1&content-type=text/plain Index: musl-1.1.8-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.8-r1.ebuild,v 1.1 2015/04/15 23:10:51 blueness Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-2 fi export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then if [[ ${CATEGORY} == cross-* ]] ; then export CTARGET=${CATEGORY#cross-} fi fi DESCRIPTION="Lightweight, 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" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { use crosscompile_opts_headers-only && is_crosscompile } pkg_setup() { if [ ${CTARGET} == ${CHOST} ] ; then case ${CHOST} in *-musl*) ;; *) die "Use sys-devel/crossdev to build a musl toolchain" ;; esac fi epatch_user } src_configure() { tc-getCC ${CTARGET} just_headers && export CC=true local sysroot is_crosscompile && sysroot=/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix=${sysroot}/usr \ --syslibdir=${sysroot}/lib \ --disable-gcc-wrapper } src_compile() { emake include/bits/alltypes.h || die just_headers && return 0 emake || die } src_install() { local target="install" just_headers && target="install-headers" emake DESTDIR="${D}" ${target} || die just_headers && return 0 # musl provides ldd via a sym link to its ld.so local sysroot is_crosscompile && sysroot=/usr/${CTARGET} local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then into /usr dobin "${FILESDIR}"/getent into / dosbin "${FILESDIR}"/ldconfig fi } pkg_postinst() { is_crosscompile && return 0 [ "${ROOT}" != "/" ] && return 0 ldconfig # reload init ... /sbin/telinit U 2>/dev/null }
