* [gentoo-commits] gentoo-x86 commit in sys-libs/musl: musl-1.1.9.ebuild musl-9999.ebuild ChangeLog
@ 2015-05-13 14:49 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2015-05-13 14:49 UTC (permalink / raw
To: gentoo-commits
blueness 15/05/13 14:49:02
Modified: musl-9999.ebuild ChangeLog
Added: musl-1.1.9.ebuild
Log:
Version bump. Addresses bug #544128.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.20 sys-libs/musl/musl-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?r1=1.19&r2=1.20
Index: musl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- musl-9999.ebuild 18 Apr 2015 11:24:34 -0000 1.19
+++ musl-9999.ebuild 13 May 2015 14:49:02 -0000 1.20
@@ -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.19 2015/04/18 11:24:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.20 2015/05/13 14:49:02 blueness Exp $
EAPI=5
@@ -40,6 +40,17 @@
use crosscompile_opts_headers-only && is_crosscompile
}
+musl_endian() {
+ # XXX: this wont work for bi-endian, but we dont have any
+ touch "${T}"/endian.s
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+ case $(file "${T}"/endian.o) in
+ *" MSB "*) echo "";;
+ *" LSB "*) echo "el";;
+ *) echo "nfc";; # We shouldn't be here
+ esac
+}
+
pkg_setup() {
if [ ${CTARGET} == ${CHOST} ] ; then
case ${CHOST} in
@@ -84,10 +95,21 @@
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
+ local target=$(tc-arch) arch
+ local endian=$(musl_endian)
+ case ${target} in
+ amd64) arch="x86_64";;
+ arm) arch="armhf";; # We only have hardfloat right now
+ mips) arch="mips${endian}";;
+ ppc) arch="powerpc";;
+ x86) arch="i386";;
+ esac
+ cp "${FILESDIR}"/ldconfig.in "${T}"
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+ into /
+ dosbin "${T}"/ldconfig
into /usr
dobin "${FILESDIR}"/getent
- into /
- dosbin "${FILESDIR}"/ldconfig
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
doenvd "${T}"/00musl || die
fi
1.55 sys-libs/musl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 13 May 2015 12:51:20 -0000 1.54
+++ ChangeLog 13 May 2015 14:49:02 -0000 1.55
@@ -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.54 2015/05/13 12:51:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.55 2015/05/13 14:49:02 blueness Exp $
+
+*musl-1.1.9 (13 May 2015)
+
+ 13 May 2015; Anthony G. Basile <blueness@gentoo.org> +files/ldconfig.in,
+ +musl-1.1.9.ebuild, musl-9999.ebuild:
+ Version bump. Addresses bug #544128.
13 May 2015; Anthony G. Basile <blueness@gentoo.org> musl-1.1.8-r2.ebuild:
Stable for amd64, arm, ppc and x86.
1.1 sys-libs/musl/musl-1.1.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild?rev=1.1&content-type=text/plain
Index: musl-1.1.9.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.9.ebuild,v 1.1 2015/05/13 14:49:02 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
}
musl_endian() {
# XXX: this wont work for bi-endian, but we dont have any
touch "${T}"/endian.s
$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
case $(file "${T}"/endian.o) in
*" MSB "*) echo "";;
*" LSB "*) echo "el";;
*) echo "nfc";; # We shouldn't be here
esac
}
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
local target=$(tc-arch) arch
local endian=$(musl_endian)
case ${target} in
amd64) arch="x86_64";;
arm) arch="armhf";; # We only have hardfloat right now
mips) arch="mips${endian}";;
ppc) arch="powerpc";;
x86) arch="i386";;
esac
cp "${FILESDIR}"/ldconfig.in "${T}"
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
into /
dosbin "${T}"/ldconfig
into /usr
dobin "${FILESDIR}"/getent
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
doenvd "${T}"/00musl || die
fi
}
pkg_postinst() {
is_crosscompile && return 0
[ "${ROOT}" != "/" ] && return 0
ldconfig
# reload init ...
/sbin/telinit U 2>/dev/null
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-libs/musl: musl-1.1.9.ebuild musl-9999.ebuild ChangeLog
@ 2015-05-13 17:37 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2015-05-13 17:37 UTC (permalink / raw
To: gentoo-commits
ulm 15/05/13 17:37:07
Modified: musl-1.1.9.ebuild musl-9999.ebuild ChangeLog
Log:
[QA] Fixup whitespace.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path
1.2 sys-libs/musl/musl-1.1.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild?r1=1.1&r2=1.2
Index: musl-1.1.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- musl-1.1.9.ebuild 13 May 2015 14:49:02 -0000 1.1
+++ musl-1.1.9.ebuild 13 May 2015 17:37:06 -0000 1.2
@@ -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-1.1.9.ebuild,v 1.1 2015/05/13 14:49:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.9.ebuild,v 1.2 2015/05/13 17:37:06 ulm Exp $
EAPI=5
@@ -41,14 +41,14 @@
}
musl_endian() {
- # XXX: this wont work for bi-endian, but we dont have any
- touch "${T}"/endian.s
- $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
- case $(file "${T}"/endian.o) in
- *" MSB "*) echo "";;
- *" LSB "*) echo "el";;
- *) echo "nfc";; # We shouldn't be here
- esac
+ # XXX: this wont work for bi-endian, but we dont have any
+ touch "${T}"/endian.s
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+ case $(file "${T}"/endian.o) in
+ *" MSB "*) echo "";;
+ *" LSB "*) echo "el";;
+ *) echo "nfc";; # We shouldn't be here
+ esac
}
pkg_setup() {
@@ -95,7 +95,7 @@
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- local target=$(tc-arch) arch
+ local target=$(tc-arch) arch
local endian=$(musl_endian)
case ${target} in
amd64) arch="x86_64";;
1.21 sys-libs/musl/musl-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-9999.ebuild?r1=1.20&r2=1.21
Index: musl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- musl-9999.ebuild 13 May 2015 14:49:02 -0000 1.20
+++ musl-9999.ebuild 13 May 2015 17:37:06 -0000 1.21
@@ -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.20 2015/05/13 14:49:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.21 2015/05/13 17:37:06 ulm Exp $
EAPI=5
@@ -41,14 +41,14 @@
}
musl_endian() {
- # XXX: this wont work for bi-endian, but we dont have any
- touch "${T}"/endian.s
- $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
- case $(file "${T}"/endian.o) in
- *" MSB "*) echo "";;
- *" LSB "*) echo "el";;
- *) echo "nfc";; # We shouldn't be here
- esac
+ # XXX: this wont work for bi-endian, but we dont have any
+ touch "${T}"/endian.s
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+ case $(file "${T}"/endian.o) in
+ *" MSB "*) echo "";;
+ *" LSB "*) echo "el";;
+ *) echo "nfc";; # We shouldn't be here
+ esac
}
pkg_setup() {
@@ -95,7 +95,7 @@
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- local target=$(tc-arch) arch
+ local target=$(tc-arch) arch
local endian=$(musl_endian)
case ${target} in
amd64) arch="x86_64";;
1.56 sys-libs/musl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?r1=1.55&r2=1.56
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog 13 May 2015 14:49:02 -0000 1.55
+++ ChangeLog 13 May 2015 17:37:06 -0000 1.56
@@ -1,6 +1,10 @@
# 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.55 2015/05/13 14:49:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.56 2015/05/13 17:37:06 ulm Exp $
+
+ 13 May 2015; Ulrich Müller <ulm@gentoo.org> musl-1.1.9.ebuild,
+ musl-9999.ebuild:
+ [QA] Fixup whitespace.
*musl-1.1.9 (13 May 2015)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-13 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-13 14:49 [gentoo-commits] gentoo-x86 commit in sys-libs/musl: musl-1.1.9.ebuild musl-9999.ebuild ChangeLog Anthony G. Basile (blueness)
-- strict thread matches above, loose matches on Subject: below --
2015-05-13 17:37 Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox