* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-03 11:18 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-03 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 2c3bb292bd123f58758554c23f2d56acae081885
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep 2 16:43:53 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 11:18:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3bb292
sys-libs/musl: fix leaking of host cflags into cross-musl
Closes: https://bugs.gentoo.org/667126
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.20-r1.ebuild | 6 ++++++
sys-libs/musl/musl-1.1.21.ebuild | 6 ++++++
sys-libs/musl/musl-1.1.22.ebuild | 6 ++++++
sys-libs/musl/musl-1.1.23.ebuild | 6 ++++++
sys-libs/musl/musl-9999.ebuild | 6 ++++++
5 files changed, 30 insertions(+)
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
index 13a18acc702..f53b3b492f0 100644
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.20-r1.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_prepare() {
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index 7ce0d5e96bc..1f4e2584ce7 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 7db3e1cc384..129c8302022 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 22f16fa8bfb..0827b9d412b 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 22f16fa8bfb..0827b9d412b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-07-08 3:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-07-08 3:38 UTC (permalink / raw
To: gentoo-commits
commit: fbca53cbe2cc38881a2fe0969ec9f6f121662716
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 03:36:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 03:37:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbca53cb
sys-libs/musl: keyword 1.2.5{,-r1}
Thanks to all who did initial testing, including but not limited to
ernsteiswuerfel and immolo.
Bug: https://bugs.gentoo.org/926147
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.5-r1.ebuild | 3 +--
sys-libs/musl/musl-1.2.5.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.5-r1.ebuild b/sys-libs/musl/musl-1.2.5-r1.ebuild
index 9d233979f7e2..1e66fed0c7bf 100644
--- a/sys-libs/musl/musl-1.2.5-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.5-r1.ebuild
@@ -17,8 +17,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~riscv"
- #KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
diff --git a/sys-libs/musl/musl-1.2.5.ebuild b/sys-libs/musl/musl-1.2.5.ebuild
index 05286d2397c9..6f769c7aa732 100644
--- a/sys-libs/musl/musl-1.2.5.ebuild
+++ b/sys-libs/musl/musl-1.2.5.ebuild
@@ -17,8 +17,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~riscv"
- #KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-07-08 3:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-07-08 3:38 UTC (permalink / raw
To: gentoo-commits
commit: efc7758eb25d48658c0784adbacbccfafbc6a8d0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 03:37:15 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 03:38:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc7758e
sys-libs/musl: stabilize 1.2.4-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r2.ebuild b/sys-libs/musl/musl-1.2.4-r2.ebuild
index 1ec30208d947..dbe5caa086bd 100644
--- a/sys-libs/musl/musl-1.2.4-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r2.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-07-08 3:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-07-08 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 524a3c56ea9d613ce95f0c741956258cba33ee78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 03:36:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 03:38:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524a3c56
sys-libs/musl: drop 1.2.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.5.ebuild | 202 ----------------------------------------
1 file changed, 202 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.5.ebuild b/sys-libs/musl/musl-1.2.5.ebuild
deleted file mode 100644
index 6f769c7aa732..000000000000
--- a/sys-libs/musl/musl-1.2.5.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs prefix
-
-DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if is_crosspkg ; then
- IUSE="${IUSE/crypt/+crypt}"
-else
- RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
- PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-just_headers() {
- use headers-only && target_is_not_host
-}
-
-pkg_setup() {
- if [ ${CTARGET} == ${CHOST} ] ; then
- case ${CHOST} in
- *-musl*) ;;
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
- esac
- fi
-
- # Fix for bug #667126, copied from glibc ebuild:
- # make sure host make.conf doesn't pollute us
- if target_is_not_host || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- target_is_not_host && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix="${EPREFIX}${sysroot}/usr" \
- --syslibdir="${EPREFIX}${sysroot}/lib" \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if ! is_crosspkg ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- just_headers && return 0
-
- # musl provides ldd via a sym link to its ld.so
- local sysroot=
- target_is_not_host && sysroot=/usr/${CTARGET}
- local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
- dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
- if ! use crypt ; then
- # Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}/usr/include/crypt.h" || die
- rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
- fi
-
- if ! is_crosspkg ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
- if use split-usr; then
- dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlink, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
- else
- dosym libc.so /usr/lib/ld-musl-${arch}.so.1
- [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
- fi
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-
- if target_is_not_host ; then
- into /usr/${CTARGET}
- dolib.a libssp_nonshared.a
- else
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_preinst() {
- # Nothing to do if just installing headers
- just_headers && return
-
- # Prepare /etc/ld.so.conf.d/ for files
- mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
- target_is_not_host && return 0
-
- [[ -n "${ROOT}" ]] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-07-08 3:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-07-08 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 622294c489e5650b26614d011f693373cfd76b82
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 03:37:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 03:38:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622294c4
sys-libs/musl: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6f769c7aa732..1b451cd191de 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -55,7 +55,7 @@ just_headers() {
}
pkg_setup() {
- if [ ${CTARGET} == ${CHOST} ] ; then
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
case ${CHOST} in
*-musl*) ;;
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-05-02 7:31 Andreas K. Hüttel
0 siblings, 0 replies; 171+ messages in thread
From: Andreas K. Hüttel @ 2024-05-02 7:31 UTC (permalink / raw
To: gentoo-commits
commit: cc3ba8d03bd4af9a60e8a68e1cd1ab725750b291
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 07:30:26 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 2 07:30:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3ba8d0
sys-libs/musl: keyword 1.2.5 for -*, ~riscv
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/musl/musl-1.2.5.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-libs/musl/musl-1.2.5.ebuild b/sys-libs/musl/musl-1.2.5.ebuild
index 77268ed11b5a..05286d2397c9 100644
--- a/sys-libs/musl/musl-1.2.5.ebuild
+++ b/sys-libs/musl/musl-1.2.5.ebuild
@@ -17,6 +17,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+ KEYWORDS="-* ~riscv"
#KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 6a72c0cfd71bd62c6b8d2e501207e56205db89f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:44:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a72c0cf
sys-libs/musl: Stabilize 1.2.4-r1 amd64, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 2b3a3c526c33..008af51ce05c 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 348422faa7711b1cae41ce12991e120e0965f1b9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:44:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348422fa
sys-libs/musl: Stabilize 1.2.4-r1 ppc64, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 8a10aee572c4..60c180405e67 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ~ppc ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 89455b8d134cff9993d10eabc548c7910918f3a2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:45:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89455b8d
sys-libs/musl: Stabilize 1.2.4-r1 x86, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index e844217cea8d..cffea8ad349b 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 068ed84e920b41c3d63358693d0c235e2e6fbf23
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:44:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068ed84e
sys-libs/musl: Stabilize 1.2.4-r1 arm, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 008af51ce05c..69da1bb2f476 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: c22b21b4c3c72974e4f2a0ce1eb1360ff87ec9c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:44:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22b21b4
sys-libs/musl: Stabilize 1.2.4-r1 arm64, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 69da1bb2f476..8a10aee572c4 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-07 17:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-07 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 8809eae5e2d6623443c51cf39124bb4c435580d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:44:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:45:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8809eae5
sys-libs/musl: Stabilize 1.2.4-r1 ppc, #920477
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 60c180405e67..e844217cea8d 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ~ppc ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-04 10:24 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-04 10:24 UTC (permalink / raw
To: gentoo-commits
commit: ac802abbe03df592b08d26775bd031e30833dd87
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 10:16:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 10:23:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac802abb
sys-libs/musl: drop 1.2.3-r7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 208 -------------------------------------
1 file changed, 208 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
deleted file mode 100644
index c4e516a10a1a..000000000000
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
- IUSE="${IUSE/crypt/+crypt}"
-else
- RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
- PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if ! use crypt ; then
- # Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}/usr/include/crypt.h" || die
- rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
- fi
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlink, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-
- if is_crosscompile ; then
- into /usr/${CTARGET}
- dolib.a libssp_nonshared.a
- else
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_preinst() {
- # nothing to do if just installing headers
- just_headers && return
-
- # prepare /etc/ld.so.conf.d/ for files
- mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-03-01 7:55 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-03-01 7:55 UTC (permalink / raw
To: gentoo-commits
commit: e23653d8401aaf3ce11dbc7aa799c92077068bde
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 05:10:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 07:54:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23653d8
sys-libs/musl: add 1.2.5
Unkeyworded for testing.
While at it, some minor style tweaks.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/Manifest | 2 ++
.../musl/{musl-9999.ebuild => musl-1.2.5.ebuild} | 26 ++++++++++++----------
sys-libs/musl/musl-9999.ebuild | 24 +++++++++++---------
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b6ee312fa2ae..db22821f8a4a 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,4 +4,6 @@ DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb7
DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
DIST musl-1.2.4.tar.gz 1063758 BLAKE2B 7b5c5e335c55248789bca26084a744152f1128dd39159bcf46456ce1a4438c50097c75c7b84aa2980dccf2156f45de41e446ee39c7b3a43d80592c2b9ce75d98 SHA512 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd118012bddf0880d444fdfa456c6b448681838fcf3effa5403fd1bfbef7274cac548fecca3ec2f2e4e217ef74409 SHA512 5a3362ef1e60ae021a2c56ecde202a9dfd71914f3631ab498c8b751c38b217010997c8b28e31ebb6d1a8fb2663165a35943615825e2c220eb48ce66908ea1a9e
+DIST musl-1.2.5.tar.gz 1080786 BLAKE2B 6065dc1e01874d1b96abe714147dcc0b41ca702ca9e9c44e85864185dab0b6d085a692745db0822c94a79325e1a91dad60c52f467717d9323b2b3c6ad0a17545 SHA512 7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c
+DIST musl-1.2.5.tar.gz.asc 490 BLAKE2B f0d91b20aa7729449bd02a60adf17e8287904ed5971851a34b15f500011137ddc3f338d24712ff0481f1d6f9a749d87014a82b26a3bd9de660ddbf29678a8777 SHA512 c8aebf05b14abbd33ff568ca17ddd8b29e6f53cbb1cb85e00b64f15516ffc46a7a064c996a7bb1c9681a361a4921204ac58e4a1cfd7bd3ad60d7f2b0151d9229
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.5.ebuild
similarity index 90%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.5.ebuild
index 6034c89cca3e..77268ed11b5a 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.5.ebuild
@@ -4,7 +4,11 @@
EAPI=8
inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
+
+DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
@@ -13,10 +17,11 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+ #KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
+
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
SRC_URI+="
@@ -25,9 +30,6 @@ SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crypt headers-only split-usr"
@@ -55,12 +57,12 @@ just_headers() {
pkg_setup() {
if [ ${CTARGET} == ${CHOST} ] ; then
case ${CHOST} in
- *-musl*) ;;
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+ *-musl*) ;;
+ *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
- # fix for #667126, copied from glibc ebuild
+ # Fix for bug #667126, copied from glibc ebuild:
# make sure host make.conf doesn't pollute us
if target_is_not_host || tc-is-cross-compiler ; then
CHOST=${CTARGET} strip-unsupported-flags
@@ -118,7 +120,7 @@ src_compile() {
VPATH="${WORKDIR}/misc"
fi
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
}
@@ -184,17 +186,17 @@ src_install() {
}
pkg_preinst() {
- # nothing to do if just installing headers
+ # Nothing to do if just installing headers
just_headers && return
- # prepare /etc/ld.so.conf.d/ for files
+ # Prepare /etc/ld.so.conf.d/ for files
mkdir -p "${EROOT}"/etc/ld.so.conf.d
}
pkg_postinst() {
target_is_not_host && return 0
- [ -n "${ROOT}" ] && return 0
+ [[ -n "${ROOT}" ]] && return 0
ldconfig || die
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6034c89cca3e..6f769c7aa732 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -4,7 +4,11 @@
EAPI=8
inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
+
+DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
@@ -17,6 +21,7 @@ else
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
+
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
SRC_URI+="
@@ -25,9 +30,6 @@ SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crypt headers-only split-usr"
@@ -55,12 +57,12 @@ just_headers() {
pkg_setup() {
if [ ${CTARGET} == ${CHOST} ] ; then
case ${CHOST} in
- *-musl*) ;;
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+ *-musl*) ;;
+ *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
- # fix for #667126, copied from glibc ebuild
+ # Fix for bug #667126, copied from glibc ebuild:
# make sure host make.conf doesn't pollute us
if target_is_not_host || tc-is-cross-compiler ; then
CHOST=${CTARGET} strip-unsupported-flags
@@ -118,7 +120,7 @@ src_compile() {
VPATH="${WORKDIR}/misc"
fi
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
}
@@ -184,17 +186,17 @@ src_install() {
}
pkg_preinst() {
- # nothing to do if just installing headers
+ # Nothing to do if just installing headers
just_headers && return
- # prepare /etc/ld.so.conf.d/ for files
+ # Prepare /etc/ld.so.conf.d/ for files
mkdir -p "${EROOT}"/etc/ld.so.conf.d
}
pkg_postinst() {
target_is_not_host && return 0
- [ -n "${ROOT}" ] && return 0
+ [[ -n "${ROOT}" ]] && return 0
ldconfig || die
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2024-01-01 2:20 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2024-01-01 2:20 UTC (permalink / raw
To: gentoo-commits
commit: ed7efdde467bc364ea1e0de15136bbd500724faf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 02:19:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 02:19:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7efdde
sys-libs/musl: fix comment typo
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 4 ++--
sys-libs/musl/musl-1.2.3-r8.ebuild | 4 ++--
sys-libs/musl/musl-1.2.4-r1.ebuild | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index a201a7574d4a..c4e516a10a1a 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -167,7 +167,7 @@ src_install() {
rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlnk, OK, we really do need to abort.
+ # If it's still a dead symlink, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index e50192bdc1fb..cda9968c6cc1 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -167,7 +167,7 @@ src_install() {
rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
if use split-usr; then
dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlnk, OK, we really do need to abort.
+ # If it's still a dead symlink, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
else
dosym libc.so /usr/lib/ld-musl-${arch}.so.1
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 1d1973c35acc..2b3a3c526c33 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -159,7 +159,7 @@ src_install() {
rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
if use split-usr; then
dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlnk, OK, we really do need to abort.
+ # If it's still a dead symlink, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
else
dosym libc.so /usr/lib/ld-musl-${arch}.so.1
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 2908fbd17541..6034c89cca3e 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -155,7 +155,7 @@ src_install() {
rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
if use split-usr; then
dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlnk, OK, we really do need to abort.
+ # If it's still a dead symlink, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
else
dosym libc.so /usr/lib/ld-musl-${arch}.so.1
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: af8560acbdc6b9dff6045a4ce8c6fdcf8c306371
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:13 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8560ac
sys-libs/musl: Stabilize 1.2.3-r8 amd64, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index f8962b382f48..bb12dfba3902 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: bf6fcf3f3f60ea6834216300f6ebd7fe0a93f41c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:28 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6fcf3f
sys-libs/musl: Stabilize 1.2.3-r8 ppc64, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index 613ec3795d38..e50192bdc1fb 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 91edb6a598fd3029a168ff4c8df47be7c05f093d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:22 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91edb6a5
sys-libs/musl: Stabilize 1.2.3-r8 arm64, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index 75c0524919df..3459e7ce7d1f 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: f59673f2dc16d0314d0575846cb1b8b3400ec272
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:16 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59673f2
sys-libs/musl: Stabilize 1.2.3-r8 x86, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index bb12dfba3902..d3012fb24f0c 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: b50a2cbf5df4b11bb5d10116d65f6a1cbb84c9ff
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:19 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50a2cbf
sys-libs/musl: Stabilize 1.2.3-r8 arm, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index d3012fb24f0c..75c0524919df 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-30 6:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-12-30 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 6d7c2ba4995706a7d1ffcf73b0427a353da6d064
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 06:59:25 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 06:59:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7c2ba4
sys-libs/musl: Stabilize 1.2.3-r8 ppc, #920977
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index 3459e7ce7d1f..613ec3795d38 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-28 3:53 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-12-28 3:53 UTC (permalink / raw
To: gentoo-commits
commit: c5a92dd06d03b915f2495b1e79389122b1947039
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:48:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:48:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a92dd0
sys-libs/musl: drop 1.2.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4.ebuild | 200 ----------------------------------------
1 file changed, 200 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
deleted file mode 100644
index 2908fbd17541..000000000000
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if is_crosspkg ; then
- IUSE="${IUSE/crypt/+crypt}"
-else
- RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
- PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-just_headers() {
- use headers-only && target_is_not_host
-}
-
-pkg_setup() {
- if [ ${CTARGET} == ${CHOST} ] ; then
- case ${CHOST} in
- *-musl*) ;;
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
- esac
- fi
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if target_is_not_host || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- target_is_not_host && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix="${EPREFIX}${sysroot}/usr" \
- --syslibdir="${EPREFIX}${sysroot}/lib" \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if ! is_crosspkg ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- just_headers && return 0
-
- # musl provides ldd via a sym link to its ld.so
- local sysroot=
- target_is_not_host && sysroot=/usr/${CTARGET}
- local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
- dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
- if ! use crypt ; then
- # Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}/usr/include/crypt.h" || die
- rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
- fi
-
- if ! is_crosspkg ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
- if use split-usr; then
- dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
- else
- dosym libc.so /usr/lib/ld-musl-${arch}.so.1
- [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
- fi
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-
- if target_is_not_host ; then
- into /usr/${CTARGET}
- dolib.a libssp_nonshared.a
- else
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_preinst() {
- # nothing to do if just installing headers
- just_headers && return
-
- # prepare /etc/ld.so.conf.d/ for files
- mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
- target_is_not_host && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-28 3:53 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-12-28 3:53 UTC (permalink / raw
To: gentoo-commits
commit: db17cbacf9049291325c7a8f938a1345c4f9e183
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:48:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:48:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db17cbac
sys-libs/musl: drop 1.2.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 174 ----------------------------------------
1 file changed, 174 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
deleted file mode 100644
index 850138951e5e..000000000000
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-12-17 11:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-12-17 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 9c23fa50904bbb495578a8547f6918b0c4f96614
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 17 11:00:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 11:44:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c23fa50
sys-libs/musl: use https for git clone
git:// is unencrypted and could be used by an attacker (mitm) to insert malicious code, see also [1]. I think especially for such a critical system package like musl it's better to use the more secure https variant.
git:// runs on port 9418 which is also less likely open behind a firewall.
[1] git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols
[sam: I think musl only recently started to support this when they changed httpds in the last week.]
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34319
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
sys-libs/musl/musl-1.2.4.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index efb999922037..a201a7574d4a 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index dfe257f84b9d..f8962b382f48 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 9e1f93d9db53..850138951e5e 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 899ae673cc90..1d1973c35acc 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit crossdev flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit crossdev flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit crossdev flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
inherit git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-08-22 18:04 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-08-22 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 7a2c1f90a07b2adc0b556d6db320a64b74a30ad6
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Tue Aug 1 22:29:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 18:03:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2c1f90
sys-libs/musl: Support LLVM/Clang crossdev
This replaces inline code with functions from crossdev.eclass. Now also
supports LLVM/Clang crossdev because the eclass handles that
automatically.
Thanks wikky for help!
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.4.ebuild | 34 +++++++++++-----------------------
sys-libs/musl/musl-9999.ebuild | 40 ++++++++++++++--------------------------
2 files changed, 25 insertions(+), 49 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index a0653436a844..20b3c7f93d59 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic toolchain-funcs prefix
+inherit crossdev flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -25,14 +25,6 @@ SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
HOMEPAGE="https://musl.libc.org"
@@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
# built as part as crossdev. Also, elide the blockers when in cross-*,
# as it doesn't make sense to block the normal CBUILD libxcrypt at all
# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
+if is_crosspkg ; then
IUSE="${IUSE/crypt/+crypt}"
else
RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
fi
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
just_headers() {
- use headers-only && is_crosscompile
+ use headers-only && target_is_not_host
}
pkg_setup() {
@@ -74,7 +62,7 @@ pkg_setup() {
# fix for #667126, copied from glibc ebuild
# make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
+ if target_is_not_host || tc-is-cross-compiler ; then
CHOST=${CTARGET} strip-unsupported-flags
fi
}
@@ -86,7 +74,7 @@ src_unpack() {
# We only verify the release; not the additional (fixed, safe) files
# we download.
# (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
default
@@ -108,7 +96,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ target_is_not_host && sysroot=/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix="${EPREFIX}${sysroot}/usr" \
@@ -121,7 +109,7 @@ src_compile() {
just_headers && return 0
emake
- if [[ ${CATEGORY} != cross-* ]] ; then
+ if ! is_crosspkg ; then
emake -C "${T}" getconf getent iconv \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
@@ -142,7 +130,7 @@ src_install() {
# musl provides ldd via a sym link to its ld.so
local sysroot=
- is_crosscompile && sysroot=/usr/${CTARGET}
+ target_is_not_host && sysroot=/usr/${CTARGET}
local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
@@ -152,7 +140,7 @@ src_install() {
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
fi
- if [[ ${CATEGORY} != cross-* ]] ; then
+ if ! is_crosspkg ; then
# Fish out of config:
# ARCH = ...
# SUBARCH = ...
@@ -187,7 +175,7 @@ src_install() {
doenvd "${T}"/00musl
fi
- if is_crosscompile ; then
+ if target_is_not_host ; then
into /usr/${CTARGET}
dolib.a libssp_nonshared.a
else
@@ -204,7 +192,7 @@ pkg_preinst() {
}
pkg_postinst() {
- is_crosscompile && return 0
+ target_is_not_host && return 0
[ -n "${ROOT}" ] && return 0
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index a72d5929d386..20b3c7f93d59 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+inherit crossdev flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
@@ -25,14 +25,6 @@ SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
HOMEPAGE="https://musl.libc.org"
@@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
# built as part as crossdev. Also, elide the blockers when in cross-*,
# as it doesn't make sense to block the normal CBUILD libxcrypt at all
# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
+if is_crosspkg ; then
IUSE="${IUSE/crypt/+crypt}"
else
RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
fi
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
just_headers() {
- use headers-only && is_crosscompile
+ use headers-only && target_is_not_host
}
pkg_setup() {
@@ -74,7 +62,7 @@ pkg_setup() {
# fix for #667126, copied from glibc ebuild
# make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
+ if target_is_not_host || tc-is-cross-compiler ; then
CHOST=${CTARGET} strip-unsupported-flags
fi
}
@@ -86,7 +74,7 @@ src_unpack() {
# We only verify the release; not the additional (fixed, safe) files
# we download.
# (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
default
@@ -108,7 +96,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ target_is_not_host && sysroot=/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix="${EPREFIX}${sysroot}/usr" \
@@ -121,7 +109,7 @@ src_compile() {
just_headers && return 0
emake
- if [[ ${CATEGORY} != cross-* ]] ; then
+ if ! is_crosspkg ; then
emake -C "${T}" getconf getent iconv \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
@@ -142,9 +130,9 @@ src_install() {
# musl provides ldd via a sym link to its ld.so
local sysroot=
- is_crosscompile && sysroot=/usr/${CTARGET}
+ target_is_not_host && sysroot=/usr/${CTARGET}
local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
- dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+ dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
@@ -152,7 +140,7 @@ src_install() {
rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
fi
- if [[ ${CATEGORY} != cross-* ]] ; then
+ if ! is_crosspkg ; then
# Fish out of config:
# ARCH = ...
# SUBARCH = ...
@@ -187,7 +175,7 @@ src_install() {
doenvd "${T}"/00musl
fi
- if is_crosscompile ; then
+ if target_is_not_host ; then
into /usr/${CTARGET}
dolib.a libssp_nonshared.a
else
@@ -204,7 +192,7 @@ pkg_preinst() {
}
pkg_postinst() {
- is_crosscompile && return 0
+ target_is_not_host && return 0
[ -n "${ROOT}" ] && return 0
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-05-09 11:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-05-09 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 286463897801758ffa517870a5cf2b38cadd711b
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon May 8 21:51:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 9 11:37:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28646389
sys-libs/musl: Reapply filter-lto
As strip-flags no longer removes -flto then a filter-lto is now
required to prevent bug 877343 from reopening, like has already
been applied to sys-libs/glibc.
Closes: https://bugs.gentoo.org/877343
Closes: https://github.com/gentoo/gentoo/pull/30942
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
sys-libs/musl/musl-1.2.3.ebuild | 4 ++--
sys-libs/musl/musl-1.2.4.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index a81db3854533..7f7d06440d0a 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index 9d815eafd4f6..a72d5929d386 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index f0d6a3295328..b3262c6144eb 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -88,7 +88,7 @@ src_prepare() {
}
src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index fae3ec67b201..708674beb55e 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9d815eafd4f6..a72d5929d386 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-05-02 19:11 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-05-02 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 5fff4978abbdd4b55fe85decb9df743786f57c6a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 17:51:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 2 19:11:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fff4978
sys-libs/musl: add 1.2.4
Bug: https://bugs.gentoo.org/903611
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/Manifest | 2 +
sys-libs/musl/musl-1.2.4.ebuild | 212 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 214 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 29797d2e272d..b6ee312fa2ae 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,4 +2,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb76819fb65f10ef7dd55f48d2f37a32d698dcada965c7c76c3c1cd5621447c4240b6ab2e5b39b2d214e7e302b SHA512 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c
DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
+DIST musl-1.2.4.tar.gz 1063758 BLAKE2B 7b5c5e335c55248789bca26084a744152f1128dd39159bcf46456ce1a4438c50097c75c7b84aa2980dccf2156f45de41e446ee39c7b3a43d80592c2b9ce75d98 SHA512 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
+DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd118012bddf0880d444fdfa456c6b448681838fcf3effa5403fd1bfbef7274cac548fecca3ec2f2e4e217ef74409 SHA512 5a3362ef1e60ae021a2c56ecde202a9dfd71914f3631ab498c8b751c38b217010997c8b28e31ebb6d1a8fb2663165a35943615825e2c220eb48ce66908ea1a9e
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
new file mode 100644
index 000000000000..fae3ec67b201
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs prefix
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
+ inherit verify-sig
+
+ SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
+fi
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crypt headers-only split-usr"
+
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
+
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
+if [[ ${CATEGORY} == cross-* ]] ; then
+ IUSE="${IUSE/crypt/+crypt}"
+else
+ RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+ PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
+fi
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # We only verify the release; not the additional (fixed, safe) files
+ # we download.
+ # (Seem to get IPC error on verifying in cross?)
+ ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ mkdir "${WORKDIR}"/misc || die
+ cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
+}
+
+src_configure() {
+ strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
+ tc-getCC ${CTARGET}
+
+ just_headers && export CC=true
+
+ local sysroot
+ is_crosscompile && sysroot=/usr/${CTARGET}
+ ./configure \
+ --target=${CTARGET} \
+ --prefix="${EPREFIX}${sysroot}/usr" \
+ --syslibdir="${EPREFIX}${sysroot}/lib" \
+ --disable-gcc-wrapper || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ emake -C "${T}" getconf getent iconv \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ VPATH="${WORKDIR}/misc"
+ fi
+
+ $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
+ $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 "${ED}${sysroot}"/lib/ld-musl-*)
+ dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+
+ if ! use crypt ; then
+ # Allow sys-libs/libxcrypt[system] to provide it instead
+ rm "${ED}/usr/include/crypt.h" || die
+ rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
+ fi
+
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+
+ # The musl build system seems to create a symlink:
+ # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+ # During cross or within prefix, there's no guarantee that the host is
+ # using musl so that file may not exist. Use a relative symlink within
+ # ${D} instead.
+ rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+ if use split-usr; then
+ dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+ else
+ dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+ [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+ fi
+
+ cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ eprefixify "${T}"/ldconfig
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl
+ fi
+
+ if is_crosscompile ; then
+ into /usr/${CTARGET}
+ dolib.a libssp_nonshared.a
+ else
+ dolib.a libssp_nonshared.a
+ fi
+}
+
+pkg_preinst() {
+ # nothing to do if just installing headers
+ just_headers && return
+
+ # prepare /etc/ld.so.conf.d/ for files
+ mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ -n "${ROOT}" ] && return 0
+
+ ldconfig || die
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-04-03 19:06 Mike Gilbert
0 siblings, 0 replies; 171+ messages in thread
From: Mike Gilbert @ 2023-04-03 19:06 UTC (permalink / raw
To: gentoo-commits
commit: de2bc56756fb3a7322c7f28a0cb50d2e392cfdd1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 18:38:15 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 19:06:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2bc567
sys-libs/musl: quote EPREFIX
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 6 +++---
sys-libs/musl/musl-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index cc84710e0176..4073f5c246b7 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -111,8 +111,8 @@ src_configure() {
is_crosscompile && sysroot=/usr/${CTARGET}
./configure \
--target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
+ --prefix="${EPREFIX}${sysroot}/usr" \
+ --syslibdir="${EPREFIX}${sysroot}/lib" \
--disable-gcc-wrapper || die
}
@@ -144,7 +144,7 @@ src_install() {
local sysroot
is_crosscompile && sysroot=/usr/${CTARGET}
local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+ dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index cc84710e0176..4073f5c246b7 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -111,8 +111,8 @@ src_configure() {
is_crosscompile && sysroot=/usr/${CTARGET}
./configure \
--target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
+ --prefix="${EPREFIX}${sysroot}/usr" \
+ --syslibdir="${EPREFIX}${sysroot}/lib" \
--disable-gcc-wrapper || die
}
@@ -144,7 +144,7 @@ src_install() {
local sysroot
is_crosscompile && sysroot=/usr/${CTARGET}
local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+ dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-04-03 19:06 Mike Gilbert
0 siblings, 0 replies; 171+ messages in thread
From: Mike Gilbert @ 2023-04-03 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 6de834d0aba32a86de1aee8806f8c03a815ad98e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 18:13:02 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 19:06:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de834d0
sys-libs/musl: fix ld-musl.so symlink with merged-usr
To create a symlink relative to /lib/ld-musl.so, we must know if ${ROOT}
will have /lib symlinked to /usr/lib. We rely on the split-usr USE flag to
determine this.
Closes: https://bugs.gentoo.org/903703
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../musl/{musl-9999.ebuild => musl-1.2.3-r8.ebuild} | 18 +++++++++++-------
sys-libs/musl/musl-9999.ebuild | 18 +++++++++++-------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
similarity index 92%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.3-r8.ebuild
index 9cd55f813a6c..cc84710e0176 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+inherit flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -38,7 +38,7 @@ HOMEPAGE="https://musl.libc.org"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="crypt headers-only"
+IUSE="crypt headers-only split-usr"
QA_SONAME="usr/lib/libc.so"
QA_DT_NEEDED="usr/lib/libc.so"
@@ -164,11 +164,15 @@ src_install() {
# During cross or within prefix, there's no guarantee that the host is
# using musl so that file may not exist. Use a relative symlink within
# ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+ rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+ if use split-usr; then
+ dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+ else
+ dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+ [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+ fi
cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9cd55f813a6c..cc84710e0176 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+inherit flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -38,7 +38,7 @@ HOMEPAGE="https://musl.libc.org"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="crypt headers-only"
+IUSE="crypt headers-only split-usr"
QA_SONAME="usr/lib/libc.so"
QA_DT_NEEDED="usr/lib/libc.so"
@@ -164,11 +164,15 @@ src_install() {
# During cross or within prefix, there's no guarantee that the host is
# using musl so that file may not exist. Use a relative symlink within
# ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+ rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+ if use split-usr; then
+ dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+ else
+ dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+ [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+ fi
cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-04-03 19:06 Mike Gilbert
0 siblings, 0 replies; 171+ messages in thread
From: Mike Gilbert @ 2023-04-03 19:06 UTC (permalink / raw
To: gentoo-commits
commit: e0b7d24e4ede3433e7216c70ac6872a92d990ec3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 18:48:11 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 19:06:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b7d24e
sys-libs/musl: use dosym8 -r for /usr/bin/ldd symlink
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r8.ebuild | 8 ++++----
sys-libs/musl/musl-9999.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index 4073f5c246b7..9d815eafd4f6 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs prefix
+inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -141,10 +141,10 @@ src_install() {
just_headers && return 0
# musl provides ldd via a sym link to its ld.so
- local sysroot
+ local sysroot=
is_crosscompile && sysroot=/usr/${CTARGET}
- local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
- dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd
+ local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
+ dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 4073f5c246b7..9d815eafd4f6 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs prefix
+inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -141,10 +141,10 @@ src_install() {
just_headers && return 0
# musl provides ldd via a sym link to its ld.so
- local sysroot
+ local sysroot=
is_crosscompile && sysroot=/usr/${CTARGET}
- local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
- dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd
+ local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
+ dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 7b6385f7f0169c3657db161df8ce01d3095d3954
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:32 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6385f7
sys-libs/musl: Stabilize 1.2.3-r7 ppc64, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index e798a18c629d..5245978d51ee 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 13ccc99a7f01f7b378ed515e5fc8e767c242b259
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:35 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ccc99a
sys-libs/musl: Stabilize 1.2.3-r7 ppc, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index 5245978d51ee..a81db3854533 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 181d4efe813565ec3624817d8d0596d0912cb5a8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:21 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181d4efe
sys-libs/musl: Stabilize 1.2.3-r7 x86, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index 19641f148b9b..d6a3a21baf16 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 5b0e6cab1638cc28cc81362538563458d45d54f4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:17 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0e6cab
sys-libs/musl: Stabilize 1.2.3-r7 amd64, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index 9cd55f813a6c..19641f148b9b 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 98017f4746159086078c1e22d5f7b0818dbdc03b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:28 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98017f47
sys-libs/musl: Stabilize 1.2.3-r7 arm, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index 9553f34c07a8..e798a18c629d 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-03-31 11:59 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2023-03-31 11:59 UTC (permalink / raw
To: gentoo-commits
commit: c7bd33dbb2fbc5f66f74dd9a1f03b49fd940ac4d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 11:59:24 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 11:59:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bd33db
sys-libs/musl: Stabilize 1.2.3-r7 arm64, #886217
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index d6a3a21baf16..9553f34c07a8 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-02-15 9:56 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-02-15 9:56 UTC (permalink / raw
To: gentoo-commits
commit: 3da8c378e889c78d5740a5eccf3e22784aea9f08
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 09:36:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 09:36:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da8c378
sys-libs/musl: drop 1.2.3-r5, 1.2.3-r6
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r5.ebuild | 194 -----------------------------------
sys-libs/musl/musl-1.2.3-r6.ebuild | 200 -------------------------------------
2 files changed, 394 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r5.ebuild b/sys-libs/musl/musl-1.2.3-r5.ebuild
deleted file mode 100644
index 2c0d803dd8f4..000000000000
--- a/sys-libs/musl/musl-1.2.3-r5.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
- IUSE="${IUSE/crypt/+crypt}"
-else
- RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
- PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if ! use crypt ; then
- # Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}/usr/include/crypt.h" || die
- rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
- fi
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.3-r6.ebuild b/sys-libs/musl/musl-1.2.3-r6.ebuild
deleted file mode 100644
index 231c91cb5ce1..000000000000
--- a/sys-libs/musl/musl-1.2.3-r6.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
- IUSE="${IUSE/crypt/+crypt}"
-else
- RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
- PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if ! use crypt ; then
- # Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}/usr/include/crypt.h" || die
- rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
- fi
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-
- if is_crosscompile ; then
- into /usr/${CTARGET}
- dolib.a libssp_nonshared.a
- else
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-02-05 19:08 James Le Cuirot
0 siblings, 0 replies; 171+ messages in thread
From: James Le Cuirot @ 2023-02-05 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 24698e9d84c8effa7848893aed7e6a9aff569a1f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 10:51:46 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 19:07:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24698e9d
sys-libs/musl: Create /etc/ld.so.conf.d directory like glibc does
Given that musl has long added an `include` directive for this directory to
ld.so.conf, we believe not creating the directory was an accidental omission.
gcc-config has special code to handle the case where it doesn't exist, but
eselect modules like blas do not, and subsequently break.
I have tested this, and both gcc-config and eselect-blas now behave as expected.
There is no migration to do. The tools simply start using the directory once it
is available.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r7.ebuild} | 8 ++++++++
sys-libs/musl/musl-9999.ebuild | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
similarity index 97%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.3-r7.ebuild
index 231c91cb5ce1..9cd55f813a6c 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -191,6 +191,14 @@ src_install() {
fi
}
+pkg_preinst() {
+ # nothing to do if just installing headers
+ just_headers && return
+
+ # prepare /etc/ld.so.conf.d/ for files
+ mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
pkg_postinst() {
is_crosscompile && return 0
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 231c91cb5ce1..9cd55f813a6c 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -191,6 +191,14 @@ src_install() {
fi
}
+pkg_preinst() {
+ # nothing to do if just installing headers
+ just_headers && return
+
+ # prepare /etc/ld.so.conf.d/ for files
+ mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
pkg_postinst() {
is_crosscompile && return 0
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-01-29 8:45 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-01-29 8:45 UTC (permalink / raw
To: gentoo-commits
commit: ec05593c803806726bf17fe2ef956680def9467f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 08:41:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 08:42:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec05593c
sys-libs/musl: always install libssp_nonshared.a
Needed to avoid SSP hacks for cross (if we don't install it, we have to
deal with conditionally patching GCC).
Bug: https://bugs.gentoo.org/862831
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r6.ebuild} | 8 +++++++-
sys-libs/musl/musl-9999.ebuild | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r6.ebuild
similarity index 97%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.3-r6.ebuild
index 2c0d803dd8f4..231c91cb5ce1 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -181,6 +181,12 @@ src_install() {
dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
+ fi
+
+ if is_crosscompile ; then
+ into /usr/${CTARGET}
+ dolib.a libssp_nonshared.a
+ else
dolib.a libssp_nonshared.a
fi
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 2c0d803dd8f4..231c91cb5ce1 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -181,6 +181,12 @@ src_install() {
dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
+ fi
+
+ if is_crosscompile ; then
+ into /usr/${CTARGET}
+ dolib.a libssp_nonshared.a
+ else
dolib.a libssp_nonshared.a
fi
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2023-01-15 22:41 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2023-01-15 22:41 UTC (permalink / raw
To: gentoo-commits
commit: c2241fee17b6a64e71accd1237897b808e02737d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 22:37:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 22:40:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2241fee
sys-libs/musl: drop 1.2.2-r8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/Manifest | 2 -
sys-libs/musl/musl-1.2.2-r8.ebuild | 174 -------------------------------------
2 files changed, 176 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index ed1ea5b686bf..29797d2e272d 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,7 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
-DIST musl-1.2.2.tar.gz.asc 490 BLAKE2B 8eb21bcfcbaf9d567c0a2bba468055d4ed86a9fb33126f50870ed0cb192ec8ab826d64dc129a0b4e78a7808309c006ce4fe5edae1099bc4c516c1ad4382a591d SHA512 9d76bd9d88438e21689d37d7c519bc5575fa72b121ddf89c55c1a2246ecf423664d8e5199192720d652f6d08229f9b17b5520465d49b12ed2ba80814d1d8e9d8
DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb76819fb65f10ef7dd55f48d2f37a32d698dcada965c7c76c3c1cd5621447c4240b6ab2e5b39b2d214e7e302b SHA512 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c
DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
deleted file mode 100644
index f0d6a3295328..000000000000
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
- inherit verify-sig
-
- SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # We only verify the release; not the additional (fixed, safe) files
- # we download.
- # (Seem to get IPC error on verifying in cross?)
- ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- mkdir "${WORKDIR}"/misc || die
- cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
- cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
- strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
- tc-getCC ${CTARGET}
-
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${EPREFIX}${sysroot}/usr \
- --syslibdir=${EPREFIX}${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${WORKDIR}/misc"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
- # The musl build system seems to create a symlink:
- # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
- # During cross or within prefix, there's no guarantee that the host is
- # using musl so that file may not exist. Use a relative symlink within
- # ${D} instead.
- rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
- dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
- # If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
- cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- eprefixify "${T}"/ldconfig
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ -n "${ROOT}" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-12-29 19:01 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-12-29 19:01 UTC (permalink / raw
To: gentoo-commits
commit: fc71e4500dc8046427e12feae14feeb30206767a
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Thu Dec 29 00:59:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 19:01:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc71e450
sys-libs/musl: strip-flags
Found reports of systemwide issues when Musl is compiled with -Ofast so this is
intended to at least save some users from one issue using Ofast systemwide.
Thanks-to: Krusin
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28884
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +-
sys-libs/musl/musl-1.2.3-r5.ebuild | 2 +-
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index 2c16357eb55f..f0d6a3295328 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
}
src_configure() {
- filter-lto # bug #877343
+ strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3-r5.ebuild b/sys-libs/musl/musl-1.2.3-r5.ebuild
index 76f802c610d8..2c0d803dd8f4 100644
--- a/sys-libs/musl/musl-1.2.3-r5.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r5.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- filter-lto # bug #877343
+ strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 2c16357eb55f..f0d6a3295328 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
}
src_configure() {
- filter-lto # bug #877343
+ strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 76f802c610d8..2c0d803dd8f4 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
}
src_configure() {
- filter-lto # bug #877343
+ strip-flags # Prevent issues caused by aggressive optimizations & bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-11-08 1:30 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-11-08 1:30 UTC (permalink / raw
To: gentoo-commits
commit: 00b505ef3ec34426f2feb425967ad685471efd6b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 01:15:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 01:16:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b505ef
sys-libs/musl: RDEPEND -> PDEPEND for libxcrypt
Anything actually linking against libcrypt should depend
on the virtual anyway, and this means we can have
libxcrypt properly depend on virtual/libc (which is needed
to ensure it can be installed first).
Bug: https://bugs.gentoo.org/877567
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/{musl-1.2.3-r4.ebuild => musl-1.2.3-r5.ebuild} | 6 ++----
sys-libs/musl/musl-9999.ebuild | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r5.ebuild
similarity index 98%
rename from sys-libs/musl/musl-1.2.3-r4.ebuild
rename to sys-libs/musl/musl-1.2.3-r5.ebuild
index 6f2527e85a39..76f802c610d8 100644
--- a/sys-libs/musl/musl-1.2.3-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r5.ebuild
@@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
if [[ ${CATEGORY} == cross-* ]] ; then
IUSE="${IUSE/crypt/+crypt}"
else
- RDEPEND="
- crypt? ( !sys-libs/libxcrypt[system] )
- !crypt? ( sys-libs/libxcrypt[system] )
- "
+ RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+ PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
fi
is_crosscompile() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6f2527e85a39..76f802c610d8 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -52,10 +52,8 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
if [[ ${CATEGORY} == cross-* ]] ; then
IUSE="${IUSE/crypt/+crypt}"
else
- RDEPEND="
- crypt? ( !sys-libs/libxcrypt[system] )
- !crypt? ( sys-libs/libxcrypt[system] )
- "
+ RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+ PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
fi
is_crosscompile() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-10-17 20:31 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-10-17 20:31 UTC (permalink / raw
To: gentoo-commits
commit: f44d1becbe468a4e1c36a4819a6276b9ee0c9da2
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 18:44:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 20:31:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44d1bec
sys-libs/musl: Filter LTO
After discussing my bug with dalias on #musl I was informed that LTO has a negative
impact on Musl so fixing the issue I highlight rather than filtering wouldn't be the
desired outcome for the user.
This will also help crossdev users as a bonus as -flto applies to the
crosstoolchain and can be hard to spot at first.
Chat log to comfirm:
immolo: I ran into the -flto issue while testing musl built with lto and the only thing I can find on it was a workaround in 2015.
immolo: My question though is it even worth having lto enabled on musl in the first place as every distro just seems to filter it so
there must be a reason
dalias: not only is it not worth it. it's negative value
dalias: makes musl larger and slower
dalias: if you wanted libc.a to get LTO'd into static programs, that might have some value
dalias: but LTO on libc.so is worse than worthless
Closes: https://bugs.gentoo.org/877343
Thanks-to: dalias
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27824
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 1 +
sys-libs/musl/musl-1.2.3-r4.ebuild | 1 +
sys-libs/musl/musl-1.2.3.ebuild | 1 +
sys-libs/musl/musl-9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index a7b1acd0c36c..2c16357eb55f 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -88,6 +88,7 @@ src_prepare() {
}
src_configure() {
+ filter-lto # bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild
index 1d60464d46a4..6f2527e85a39 100644
--- a/sys-libs/musl/musl-1.2.3-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r4.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
}
src_configure() {
+ filter-lto # bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index a7b1acd0c36c..2c16357eb55f 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -88,6 +88,7 @@ src_prepare() {
}
src_configure() {
+ filter-lto # bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 1d60464d46a4..6f2527e85a39 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
}
src_configure() {
+ filter-lto # bug #877343
tc-getCC ${CTARGET}
just_headers && export CC=true
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-23 1:56 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-23 1:56 UTC (permalink / raw
To: gentoo-commits
commit: fec16b2591456fed7507c4eca967cd03c8fc3a15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 01:54:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 01:54:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec16b25
sys-libs/musl: Stabilize 1.2.3 ppc, #858827
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 0b037ad8b0ee..3138a0c4d173 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-23 1:56 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-23 1:56 UTC (permalink / raw
To: gentoo-commits
commit: fb65b253a4f3b66f1b3121c8b1f7cbbf7c151e43
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 01:54:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 01:54:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb65b253
sys-libs/musl: Stabilize 1.2.3 ppc64, #858827
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 3138a0c4d173..a7b1acd0c36c 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-19 15:50 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-19 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 0f515d501eea31a42364499f4537a70efbf1d924
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 15:50:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 15:50:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f515d50
sys-libs/musl: drop libcrypt.a too for USE=-crypt
While musl doesn't split out libcrypt.so, it does
apparently for libcrypt.a.
Closes: https://bugs.gentoo.org/871726
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/{musl-1.2.3-r3.ebuild => musl-1.2.3-r4.ebuild} | 3 ++-
sys-libs/musl/musl-9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r3.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild
similarity index 98%
rename from sys-libs/musl/musl-1.2.3-r3.ebuild
rename to sys-libs/musl/musl-1.2.3-r4.ebuild
index 215d34d742fa..1d60464d46a4 100644
--- a/sys-libs/musl/musl-1.2.3-r3.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r4.ebuild
@@ -149,7 +149,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}"/usr/include/crypt.h || die
+ rm "${ED}/usr/include/crypt.h" || die
+ rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
fi
if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 215d34d742fa..1d60464d46a4 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -149,7 +149,8 @@ src_install() {
if ! use crypt ; then
# Allow sys-libs/libxcrypt[system] to provide it instead
- rm "${ED}"/usr/include/crypt.h || die
+ rm "${ED}/usr/include/crypt.h" || die
+ rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
fi
if [[ ${CATEGORY} != cross-* ]] ; then
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-13 23:46 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-13 23:46 UTC (permalink / raw
To: gentoo-commits
commit: e2438c028e2eb9d4f848d027e5f484424f6ca004
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 23:46:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 23:46:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2438c02
sys-libs/musl: set QA_PRESTRIPPED for crtn.o
vapier's comment is really it:
""'
> crt files are often hand written assembly, and for the init/fini ones,
> barely any code at all. so they tend not to have anything useful to add
> debugging wise, if the tools even support it in the first place.
>
> not really worth trying to add debugging info to really any of the crt
> files. we should figure out how to suppress the warning for them. or
> ignore it.
"""
Closes: https://bugs.gentoo.org/830213
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3-r3.ebuild | 6 ++++--
sys-libs/musl/musl-9999.ebuild | 12 +++++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r3.ebuild b/sys-libs/musl/musl-1.2.3-r3.ebuild
index 563d555aab5a..215d34d742fa 100644
--- a/sys-libs/musl/musl-1.2.3-r3.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r3.ebuild
@@ -40,8 +40,10 @@ LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crypt headers-only"
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
# built as part as crossdev. Also, elide the blockers when in cross-*,
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index b42381e40998..215d34d742fa 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -40,9 +40,15 @@ LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="crypt headers-only"
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
+
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
if [[ ${CATEGORY} == cross-* ]] ; then
IUSE="${IUSE/crypt/+crypt}"
else
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-12 17:18 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-12 17:18 UTC (permalink / raw
To: gentoo-commits
commit: debdd71325ce92399c751cd713f44a4be063ec83
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 17:17:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:18:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debdd713
sys-libs/musl: tweak libxcrypt logic for cross
We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
built as part as crossdev. Also, elide the blockers when in cross-*,
as it doesn't make sense to block the normal CBUILD libxcrypt at all
there when we're installing into /usr/${CHOST} anyway.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../musl/{musl-1.2.3-r2.ebuild => musl-1.2.3-r3.ebuild} | 16 ++++++++++++----
sys-libs/musl/musl-9999.ebuild | 12 ++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r2.ebuild b/sys-libs/musl/musl-1.2.3-r3.ebuild
similarity index 91%
rename from sys-libs/musl/musl-1.2.3-r2.ebuild
rename to sys-libs/musl/musl-1.2.3-r3.ebuild
index 153da9d0a707..563d555aab5a 100644
--- a/sys-libs/musl/musl-1.2.3-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r3.ebuild
@@ -43,10 +43,18 @@ IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
-RDEPEND="
- crypt? ( !sys-libs/libxcrypt[system] )
- !crypt? ( sys-libs/libxcrypt[system] )
-"
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
+if [[ ${CATEGORY} == cross-* ]] ; then
+ IUSE="${IUSE/crypt/+crypt}"
+else
+ RDEPEND="
+ crypt? ( !sys-libs/libxcrypt[system] )
+ !crypt? ( sys-libs/libxcrypt[system] )
+ "
+fi
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 153da9d0a707..b42381e40998 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -43,10 +43,14 @@ IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
-RDEPEND="
- crypt? ( !sys-libs/libxcrypt[system] )
- !crypt? ( sys-libs/libxcrypt[system] )
-"
+if [[ ${CATEGORY} == cross-* ]] ; then
+ IUSE="${IUSE/crypt/+crypt}"
+else
+ RDEPEND="
+ crypt? ( !sys-libs/libxcrypt[system] )
+ !crypt? ( sys-libs/libxcrypt[system] )
+ "
+fi
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-11 17:27 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: dff39d4671198d0287ae9da0263b543affe57d46
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 17:27:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 17:27:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff39d46
sys-libs/musl: fix libxcrypt dep
We only need libxcrypt when we DON'T install crypt.h
Bug: https://bugs.gentoo.org/867991
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/{musl-1.2.3-r1.ebuild => musl-1.2.3-r2.ebuild} | 5 ++++-
sys-libs/musl/musl-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3-r1.ebuild b/sys-libs/musl/musl-1.2.3-r2.ebuild
similarity index 98%
rename from sys-libs/musl/musl-1.2.3-r1.ebuild
rename to sys-libs/musl/musl-1.2.3-r2.ebuild
index fedb9137f4cb..153da9d0a707 100644
--- a/sys-libs/musl/musl-1.2.3-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r2.ebuild
@@ -43,7 +43,10 @@ IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
-RDEPEND="crypt? ( sys-libs/libxcrypt[system] )"
+RDEPEND="
+ crypt? ( !sys-libs/libxcrypt[system] )
+ !crypt? ( sys-libs/libxcrypt[system] )
+"
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index fedb9137f4cb..153da9d0a707 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -43,7 +43,10 @@ IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
-RDEPEND="crypt? ( sys-libs/libxcrypt[system] )"
+RDEPEND="
+ crypt? ( !sys-libs/libxcrypt[system] )
+ !crypt? ( sys-libs/libxcrypt[system] )
+"
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-09-10 11:28 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-09-10 11:28 UTC (permalink / raw
To: gentoo-commits
commit: fbdcef42c8f58fdd5175f2130afd56b8e42ef226
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 03:21:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 11:28:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdcef42
sys-libs/musl: add USE=crypt for libxcrypt support
Add USE=crypt to allow enabling/disabling crypt.h installation
(to allow sys-libs/libxcrypt[system] usage). Many things are starting
to want functions from libxcrypt itself (additional functions and
algorithms).
musl isn't removing crypt.h (and the relevant functions from its libc),
unlike glibc, but we need to allow disabling the installation of crypt.h
to allow libxcrypt[system] usage (which provides crypt.h & libcrypt.so
instead, with more functionality).
This brings musl in line with the changes we made for glibc a while
ago. The situation with glibc is a bit different because the migration
is mandatory there, while we're just strongly recommending it for musl
because sys-libs/libxcrypt[-system] causes headaches (see linked
PAM bug for an example, but I've also hit a similar issue with Python
yesterday).
Bug: https://bugs.gentoo.org/867991
Bug: https://bugs.gentoo.org/699422
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r1.ebuild} | 10 +++++++++-
sys-libs/musl/musl-9999.ebuild | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r1.ebuild
similarity index 95%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.3-r1.ebuild
index 07ab1388cef8..fedb9137f4cb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r1.ebuild
@@ -35,13 +35,16 @@ fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
HOMEPAGE="https://musl.libc.org"
+
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="headers-only"
+IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
+RDEPEND="crypt? ( sys-libs/libxcrypt[system] )"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -131,6 +134,11 @@ src_install() {
local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+ if ! use crypt ; then
+ # Allow sys-libs/libxcrypt[system] to provide it instead
+ rm "${ED}"/usr/include/crypt.h || die
+ fi
+
if [[ ${CATEGORY} != cross-* ]] ; then
# Fish out of config:
# ARCH = ...
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 07ab1388cef8..fedb9137f4cb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -35,13 +35,16 @@ fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
HOMEPAGE="https://musl.libc.org"
+
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="headers-only"
+IUSE="crypt headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
+RDEPEND="crypt? ( sys-libs/libxcrypt[system] )"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -131,6 +134,11 @@ src_install() {
local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+ if ! use crypt ; then
+ # Allow sys-libs/libxcrypt[system] to provide it instead
+ rm "${ED}"/usr/include/crypt.h || die
+ fi
+
if [[ ${CATEGORY} != cross-* ]] ; then
# Fish out of config:
# ARCH = ...
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-08-06 14:57 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2022-08-06 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 189bc36802a3f22f8b3c8e17c0560d8647a4ac7a
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 14:53:41 2022 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 14:53:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189bc368
sys-libs/musl: arm/arm64 stable, bug #858827
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 616d428e745b..0b037ad8b0ee 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-07-18 16:03 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-07-18 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 276cb07eddf6b21583510e62151d19fc0560893b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 16:03:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 16:03:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276cb07e
sys-libs/musl: Stabilize 1.2.3 amd64, #858827
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 07ab1388cef8..27d89025f7e3 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-07-18 16:03 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-07-18 16:03 UTC (permalink / raw
To: gentoo-commits
commit: c2514cb70f6f51c1145b635b7ffde819eb9631ad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 16:03:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 16:03:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2514cb7
sys-libs/musl: Stabilize 1.2.3 x86, #858827
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 27d89025f7e3..616d428e745b 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-06-22 23:12 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-06-22 23:12 UTC (permalink / raw
To: gentoo-commits
commit: ed5d5e92234619c70250fd14d09979ab909d96de
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 23:11:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 23:12:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5d5e92
sys-libs/musl: stable 1.2.2-r8 for amd64, arm, arm64, ppc64, x86
Closes: https://bugs.gentoo.org/838046
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index ee20a7659de3..a7b1acd0c36c 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-23 2:09 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-04-23 2:09 UTC (permalink / raw
To: gentoo-commits
commit: a258229c73554b23d6eb0c60a0d4706f7d19dc32
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 02:07:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 02:07:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a258229c
sys-libs/musl: fix ROOT check in pkg_postinst
With EAPI 7+, ROOT and others will be blank (not /).
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r7.ebuild | 2 +-
sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +-
sys-libs/musl/musl-1.2.3.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r7.ebuild b/sys-libs/musl/musl-1.2.2-r7.ebuild
index e03ad57480ff..de91db9af87b 100644
--- a/sys-libs/musl/musl-1.2.2-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r7.ebuild
@@ -161,7 +161,7 @@ src_install() {
pkg_postinst() {
is_crosscompile && return 0
- [ "${ROOT}" != "/" ] && return 0
+ [ -n "${ROOT}" ] && return 0
ldconfig || die
}
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index c83d3cbb6c04..ee20a7659de3 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -167,7 +167,7 @@ src_install() {
pkg_postinst() {
is_crosscompile && return 0
- [ "${ROOT}" != "/" ] && return 0
+ [ -n "${ROOT}" ] && return 0
ldconfig || die
}
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 26ac4bb3ec3b..07ab1388cef8 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -167,7 +167,7 @@ src_install() {
pkg_postinst() {
is_crosscompile && return 0
- [ "${ROOT}" != "/" ] && return 0
+ [ -n "${ROOT}" ] && return 0
ldconfig || die
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 26ac4bb3ec3b..07ab1388cef8 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -167,7 +167,7 @@ src_install() {
pkg_postinst() {
is_crosscompile && return 0
- [ "${ROOT}" != "/" ] && return 0
+ [ -n "${ROOT}" ] && return 0
ldconfig || die
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-15 16:39 Arthur Zamarin
0 siblings, 0 replies; 171+ messages in thread
From: Arthur Zamarin @ 2022-04-15 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 8484c8697002c8c1db901b09c6d5ef7e6ee96f97
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 16:39:23 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 16:39:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8484c869
sys-libs/musl: Stabilize 1.2.2-r8 ppc, #838046
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index 26ac4bb3ec3b..c83d3cbb6c04 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -13,7 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-12 7:15 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-04-12 7:15 UTC (permalink / raw
To: gentoo-commits
commit: cb4832090baefa2d4720d655f0718df29a56e97c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 07:14:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 07:14:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb483209
sys-libs/musl: keyword 1.2.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.3.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index ffc41fe31d84..26ac4bb3ec3b 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,8 +13,7 @@ else
SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
- # Unkeyworded for testing
- #KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-07 22:38 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-04-07 22:38 UTC (permalink / raw
To: gentoo-commits
commit: e30902683407cc5e45e35458e34ce5acdc240e0a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 22:37:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 22:38:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3090268
sys-libs/musl: disable verify-sig for cross-compile for now
I get an IPC error on verification in cross.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 3 ++-
sys-libs/musl/musl-1.2.3.ebuild | 3 ++-
sys-libs/musl/musl-9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index 0f071f2ac487..26ac4bb3ec3b 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -71,7 +71,8 @@ src_unpack() {
elif use verify-sig ; then
# We only verify the release; not the additional (fixed, safe) files
# we download.
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ # (Seem to get IPC error on verifying in cross?)
+ ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
default
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index f478bd448468..ffc41fe31d84 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -72,7 +72,8 @@ src_unpack() {
elif use verify-sig ; then
# We only verify the release; not the additional (fixed, safe) files
# we download.
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ # (Seem to get IPC error on verifying in cross?)
+ ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
default
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 0f071f2ac487..26ac4bb3ec3b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -71,7 +71,8 @@ src_unpack() {
elif use verify-sig ; then
# We only verify the release; not the additional (fixed, safe) files
# we download.
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ # (Seem to get IPC error on verifying in cross?)
+ ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
default
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-07 20:55 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-04-07 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 888a554b4bc09dfe6df23af49e59ebd04352a70c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 20:55:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 20:55:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888a554b
sys-libs/musl: add 1.2.3 (unkeyworded)
Unkeyworded for testing.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/Manifest | 2 +
sys-libs/musl/musl-1.2.3.ebuild | 173 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 175 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index c94ab71e6cf2..ed1ea5b686bf 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,4 +2,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
DIST musl-1.2.2.tar.gz.asc 490 BLAKE2B 8eb21bcfcbaf9d567c0a2bba468055d4ed86a9fb33126f50870ed0cb192ec8ab826d64dc129a0b4e78a7808309c006ce4fe5edae1099bc4c516c1ad4382a591d SHA512 9d76bd9d88438e21689d37d7c519bc5575fa72b121ddf89c55c1a2246ecf423664d8e5199192720d652f6d08229f9b17b5520465d49b12ed2ba80814d1d8e9d8
+DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb76819fb65f10ef7dd55f48d2f37a32d698dcada965c7c76c3c1cd5621447c4240b6ab2e5b39b2d214e7e302b SHA512 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c
+DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
new file mode 100644
index 000000000000..f478bd448468
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.musl-libc.org/musl"
+ inherit git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
+ inherit verify-sig
+
+ SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+ # Unkeyworded for testing
+ #KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
+fi
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # We only verify the release; not the additional (fixed, safe) files
+ # we download.
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ mkdir "${WORKDIR}"/misc || die
+ cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
+}
+
+src_configure() {
+ tc-getCC ${CTARGET}
+
+ just_headers && export CC=true
+
+ local sysroot
+ is_crosscompile && sysroot=/usr/${CTARGET}
+ ./configure \
+ --target=${CTARGET} \
+ --prefix=${EPREFIX}${sysroot}/usr \
+ --syslibdir=${EPREFIX}${sysroot}/lib \
+ --disable-gcc-wrapper || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ emake -C "${T}" getconf getent iconv \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ VPATH="${WORKDIR}/misc"
+ fi
+
+ $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
+ $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 "${ED}"${sysroot}/lib/ld-musl-*)
+ dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+
+ # The musl build system seems to create a symlink:
+ # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+ # During cross or within prefix, there's no guarantee that the host is
+ # using musl so that file may not exist. Use a relative symlink within
+ # ${D} instead.
+ rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
+ dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+
+ cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ eprefixify "${T}"/ldconfig
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl
+ dolib.a libssp_nonshared.a
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-04-07 20:55 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-04-07 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 64fabbc32105b814d1ad90f2e71f7309f1e2da1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 20:53:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 20:55:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64fabbc3
sys-libs/musl: add verify-sig
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.2.2-r8.ebuild | 32 ++++++++++++++++++++++++--------
sys-libs/musl/musl-9999.ebuild | 32 ++++++++++++++++++++++++--------
3 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 33b6ddc01148..c94ab71e6cf2 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,4 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
+DIST musl-1.2.2.tar.gz.asc 490 BLAKE2B 8eb21bcfcbaf9d567c0a2bba468055d4ed86a9fb33126f50870ed0cb192ec8ab826d64dc129a0b4e78a7808309c006ce4fe5edae1099bc4c516c1ad4382a591d SHA512 9d76bd9d88438e21689d37d7c519bc5575fa72b121ddf89c55c1a2246ecf423664d8e5199192720d652f6d08229f9b17b5520465d49b12ed2ba80814d1d8e9d8
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index 34fc6172b105..0f071f2ac487 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -8,8 +8,14 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
+ inherit verify-sig
+
+ SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
@@ -60,19 +66,29 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} == 9999 ]]; then
+ if [[ ${PV} == 9999 ]] ; then
git-r3_src_unpack
- else
- unpack "${P}.tar.gz"
+ elif use verify-sig ; then
+ # We only verify the release; not the additional (fixed, safe) files
+ # we download.
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
- mkdir misc || die
- cp "${DISTDIR}"/getconf.c misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die
- cp "${DISTDIR}"/iconv.c misc/iconv.c || die
+
+ default
+}
+
+src_prepare() {
+ default
+
+ mkdir "${WORKDIR}"/misc || die
+ cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
}
src_configure() {
tc-getCC ${CTARGET}
+
just_headers && export CC=true
local sysroot
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 34fc6172b105..0f071f2ac487 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -8,8 +8,14 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc
+ inherit verify-sig
+
+ SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
@@ -60,19 +66,29 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} == 9999 ]]; then
+ if [[ ${PV} == 9999 ]] ; then
git-r3_src_unpack
- else
- unpack "${P}.tar.gz"
+ elif use verify-sig ; then
+ # We only verify the release; not the additional (fixed, safe) files
+ # we download.
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
fi
- mkdir misc || die
- cp "${DISTDIR}"/getconf.c misc/getconf.c || die
- cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die
- cp "${DISTDIR}"/iconv.c misc/iconv.c || die
+
+ default
+}
+
+src_prepare() {
+ default
+
+ mkdir "${WORKDIR}"/misc || die
+ cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
}
src_configure() {
tc-getCC ${CTARGET}
+
just_headers && export CC=true
local sysroot
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-02-26 17:32 Andreas K. Hüttel
0 siblings, 0 replies; 171+ messages in thread
From: Andreas K. Hüttel @ 2022-02-26 17:32 UTC (permalink / raw
To: gentoo-commits
commit: b1b5b83f01d35117eda272551861e2599ed12897
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 17:32:00 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 17:32:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b5b83f
sys-libs/musl: Keyword ~riscv
Tested with crossdev and a qemu-user lp64d chroot
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index 52960e95a004..34fc6172b105 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 52960e95a004..34fc6172b105 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2022-02-10 4:12 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2022-02-10 4:12 UTC (permalink / raw
To: gentoo-commits
commit: 4dc12af5875cb83833fc057ad78bc0910f0f16b1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 04:11:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 04:11:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc12af5
sys-libs/musl: stabilize 1.2.2-r7
Contians some previous ldconfig fixes.
Bug: https://bugs.gentoo.org/663990
Bug: https://bugs.gentoo.org/696818
Bug: https://bugs.gentoo.org/833018
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r7.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r7.ebuild b/sys-libs/musl/musl-1.2.2-r7.ebuild
index dac76c213424..e03ad57480ff 100644
--- a/sys-libs/musl/musl-1.2.2-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-12-01 21:57 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2021-12-01 21:57 UTC (permalink / raw
To: gentoo-commits
commit: a0e216a9431ee907fd4664efb34f238be41db851
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 21:57:06 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 21:57:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e216a9
sys-libs/musl: bump to newer ldconfig
Closes: https://bugs.gentoo.org/827833
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r6.ebuild b/sys-libs/musl/musl-1.2.2-r6.ebuild
index f22728391c1d..79a60682c79f 100644
--- a/sys-libs/musl/musl-1.2.2-r6.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-19 3:05 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-19 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 8651db79f43c4f81ba2ca558e380994fc30987d7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 03:03:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 03:03:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8651db79
sys-libs/musl: destabilize 1.2.2-r5
Accidentally pushed as stable.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r5.ebuild b/sys-libs/musl/musl-1.2.2-r5.ebuild
index 79a60682c79f..f22728391c1d 100644
--- a/sys-libs/musl/musl-1.2.2-r5.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-18 0:48 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-18 0:48 UTC (permalink / raw
To: gentoo-commits
commit: d32f0e0afb8a401311e84abdd88512e4669c84e9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 00:47:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 00:48:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32f0e0a
sys-libs/musl: sync live ebuild
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6406ba1a6633..1ba86e7846fb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -131,7 +131,7 @@ src_install() {
# During cross, there's no guarantee that the host is using musl
# so that file may not exist. Use a relative symlink within ${D}
# instead.
- dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
+ dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-18 0:02 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-18 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 49f4daae534d359eb473556c4c6a6745bb37974e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 00:01:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 00:01:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f4daae
sys-libs/musl: fix symlink path again
Bug: https://bugs.gentoo.org/732482
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r4.ebuild b/sys-libs/musl/musl-1.2.2-r4.ebuild
index 3fed1286ae1e..868577f61ad2 100644
--- a/sys-libs/musl/musl-1.2.2-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r4.ebuild
@@ -138,7 +138,7 @@ src_install() {
# During cross, there's no guarantee that the host is using musl
# so that file may not exist. Use a relative symlink within ${D}
# instead.
- dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
+ dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to abort.
[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-16 2:59 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-16 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 9f298f1a006956c0bf05b549146a90e141df5489
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 02:58:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 02:58:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f298f1a
sys-libs/musl: stabilize 1.2.2-r4
Trivial ebuild-only changes but I wanted to let it soak in ~arch for a bit.
Bug: https://bugs.gentoo.org/732482
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r4.ebuild b/sys-libs/musl/musl-1.2.2-r4.ebuild
index bb9c60c348d0..3fed1286ae1e 100644
--- a/sys-libs/musl/musl-1.2.2-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-15 7:19 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-15 7:19 UTC (permalink / raw
To: gentoo-commits
commit: 6be6a952bef5e640dd3a49fb447e5858e967ec8f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 07:18:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 07:19:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be6a952
sys-libs/musl: use ${ED} not ${D} in sysroot hack
Need to ensure the rest of the ebuild is Prefix ready anyway
but there's no reason to make it worse with stuff we
recently added, so let's use ${ED} there.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r4.ebuild | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r4.ebuild b/sys-libs/musl/musl-1.2.2-r4.ebuild
index 0fe2c8c9a67b..bb9c60c348d0 100644
--- a/sys-libs/musl/musl-1.2.2-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r4.ebuild
@@ -128,7 +128,7 @@ src_install() {
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
- if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ if [[ ! -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] ; then
# During cross (using crossdev), when emerging sys-libs/musl,
# if /usr/lib/libc.so.1 doesn't exist on the system, installation
# would fail.
@@ -141,7 +141,7 @@ src_install() {
dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
fi
cp "${FILESDIR}"/ldconfig.in "${T}" || die
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 5736eadc0fb4..6406ba1a6633 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -121,7 +121,7 @@ src_install() {
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
- if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ if [[ ! -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] ; then
# During cross (using crossdev), when emerging sys-libs/musl,
# if /usr/lib/libc.so.1 doesn't exist on the system, installation
# would fail.
@@ -134,7 +134,7 @@ src_install() {
dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to abort.
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
fi
cp "${FILESDIR}"/ldconfig.in "${T}" || die
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-10 3:39 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-10 3:39 UTC (permalink / raw
To: gentoo-commits
commit: 2f233fc432ae93af6065bfa7913f5f3f471cbf9e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 03:39:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 03:39:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f233fc4
sys-libs/musl: update maintainers (add musl@ so it's CC'd on bugs)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml
index ffcc1ba7137..e3dfac351e2 100644
--- a/sys-libs/musl/metadata.xml
+++ b/sys-libs/musl/metadata.xml
@@ -12,4 +12,8 @@
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>musl@gentoo.org</email>
+ <name>Musl project</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 171+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-11-10 3:32 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-11-10 3:32 UTC (permalink / raw
To: gentoo-commits
commit: a4957cb794dce725b4801ee16a36f38526bdce2d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 03:31:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 03:32:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4957cb7
sys-libs/musl: create relative symlink to libc.so if existing one fails
The build system seems to create an absolute symlink to libc.so on
the host which may not exist.
If it doesn't (to avoid being disruptive, we could do this unconditionally),
create a new one relative within ${D} to facilitate SYSROOT installs.
I've hit this a few times when using crossdev but finally dug into it
a bit more.
Bug: https://bugs.gentoo.org/732482
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{musl-9999.ebuild => musl-1.2.2-r4.ebuild} | 27 ++++++++++++++++++++--
sys-libs/musl/musl-9999.ebuild | 20 ++++++++++++++--
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.2-r4.ebuild
similarity index 81%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.2-r4.ebuild
index 56a2bbbc42f..0fe2c8c9a67 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit eapi8-dosym flag-o-matic toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -71,6 +71,13 @@ src_unpack() {
cp "${DISTDIR}"/iconv.c misc/iconv.c || die
}
+src_prepare() {
+ default
+
+ # Expand gethostid instead of being just a stub
+ eapply "${FILESDIR}/${PN}-1.2.2-gethostid.patch"
+}
+
src_configure() {
tc-getCC ${CTARGET}
just_headers && export CC=true
@@ -120,7 +127,23 @@ src_install() {
# SUBARCH = ...
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+
+ if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ # During cross (using crossdev), when emerging sys-libs/musl,
+ # if /usr/lib/libc.so.1 doesn't exist on the system, installation
+ # would fail.
+ #
+ # The musl build system seems to create a symlink:
+ # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+ # During cross, there's no guarantee that the host is using musl
+ # so that file may not exist. Use a relative symlink within ${D}
+ # instead.
+ dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
+
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ fi
+
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 56a2bbbc42f..5736eadc0fb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit eapi8-dosym flag-o-matic toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.musl-libc.org/musl"
inherit git-r3
@@ -120,7 +120,23 @@ src_install() {
# SUBARCH = ...
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+
+ if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ # During cross (using crossdev), when emerging sys-libs/musl,
+ # if /usr/lib/libc.so.1 doesn't exist on the system, installation
+ # would fail.
+ #
+ # The musl build system seems to create a symlink:
+ # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+ # During cross, there's no guarantee that the host is using musl
+ # so that file may not exist. Use a relative symlink within ${D}
+ # instead.
+ dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
+
+ # If it's still a dead symlnk, OK, we really do need to abort.
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ fi
+
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-08-16 0:59 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2021-08-16 0:59 UTC (permalink / raw
To: gentoo-commits
commit: b9edd5ee563ad95facdb006750cbb8249bd10075
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 00:56:31 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 00:59:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9edd5ee
sys-libs/musl: remove whitespace introduced from previous commit
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r3.ebuild b/sys-libs/musl/musl-1.2.2-r3.ebuild
index 465a763222d..5d2851eac25 100644
--- a/sys-libs/musl/musl-1.2.2-r3.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r3.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
# Expand gethostid instead of being just a stub
eapply "${FILESDIR}/${PN}-1.2.2-gethostid.patch"
-}
+}
src_configure() {
tc-getCC ${CTARGET}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-06-06 9:31 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2021-06-06 9:31 UTC (permalink / raw
To: gentoo-commits
commit: ce6f784055228fa100f145581d2fbbf675cd1e7e
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat Jun 5 23:33:20 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 6 09:31:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce6f7840
sys-libs/musl: fix HOMEPAGE
As per http://www.musl-libc.org/, "musl has moved to a new domain:
musl.libc.org"
Bug: https://bugs.gentoo.org/794484
Signed-off-by: Bertrand Jacquin <bertrand <AT> jacquin.bzh>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/21138
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r2.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index 732b5c5364b..905348ba854 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -28,7 +28,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
+HOMEPAGE="https://musl.libc.org"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="headers-only"
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index b4f43dbfc2b..56a2bbbc42f 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi
DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
+HOMEPAGE="https://musl.libc.org"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
IUSE="headers-only"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-04-24 12:37 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2021-04-24 12:37 UTC (permalink / raw
To: gentoo-commits
commit: c35702f082adba18351aa9aa3ccb33387cad564c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 12:25:02 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 12:37:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35702f0
sys-libs/musl: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/musl/Manifest | 2 -
sys-libs/musl/musl-1.2.1-r2.ebuild | 136 -------------------------------------
2 files changed, 138 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 35cd11cf03b..33b6ddc0114 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +1,4 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
-DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild b/sys-libs/musl/musl-1.2.1-r2.ebuild
deleted file mode 100644
index cdf6683a578..00000000000
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.musl-libc.org/musl"
- inherit git-r3
- SRC_URI="
- 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"
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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 ppc64 x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2020-28928.patch"
-)
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_configure() {
- tc-getCC ${CTARGET}
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${sysroot}/usr \
- --syslibdir=${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- if [[ ${CATEGORY} != cross-* ]] ; then
- emake -C "${T}" getconf getent iconv \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- VPATH="${DISTDIR}"
- fi
-
- $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
- $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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
- # Fish out of config:
- # ARCH = ...
- # SUBARCH = ...
- # and print $(ARCH)$(SUBARCH).
- local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- dolib.a libssp_nonshared.a
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-04-03 11:52 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2021-04-03 11:52 UTC (permalink / raw
To: gentoo-commits
commit: f63594fb5f1e5653f831e1ff16d56f67f29bcfa6
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 3 11:52:01 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 11:52:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63594fb
sys-libs/musl: stabilize 1.2.2-r2
Closes: https://bugs.gentoo.org/779799
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index d9551e1c7e4..cb33284298e 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-02-16 20:09 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2021-02-16 20:09 UTC (permalink / raw
To: gentoo-commits
commit: cfa2c824755cd4cef61045bd4b703d773b0ed05d
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 20:09:24 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 20:09:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa2c824
sys-libs/musl: unbreak cross-compiles
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r2.ebuild | 3 +--
sys-libs/musl/musl-1.2.2-r2.ebuild | 3 +--
sys-libs/musl/musl-9999.ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild b/sys-libs/musl/musl-1.2.1-r2.ebuild
index 5e1a335f41a..02735e87688 100644
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.1-r2.ebuild
@@ -123,9 +123,8 @@ src_install() {
dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
+ dolib.a libssp_nonshared.a
fi
-
- dolib.a libssp_nonshared.a
}
pkg_postinst() {
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index 9025fd02109..d9551e1c7e4 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -131,9 +131,8 @@ src_install() {
dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
+ dolib.a libssp_nonshared.a
fi
-
- dolib.a libssp_nonshared.a
}
pkg_postinst() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9025fd02109..d9551e1c7e4 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -131,9 +131,8 @@ src_install() {
dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
+ dolib.a libssp_nonshared.a
fi
-
- dolib.a libssp_nonshared.a
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-02-15 0:32 Sam James
0 siblings, 0 replies; 171+ messages in thread
From: Sam James @ 2021-02-15 0:32 UTC (permalink / raw
To: gentoo-commits
commit: cea3ee97d8a910387898df876238a811277a8a42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:28:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:32:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea3ee97
sys-libs/musl: fix double KEYWORDS
Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.
See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild b/sys-libs/musl/musl-1.2.1-r2.ebuild
index 49021690de1..5e1a335f41a 100644
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.1-r2.ebuild
@@ -11,7 +11,6 @@ if [[ ${PV} == "9999" ]] ; then
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=""
else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
https://dev.gentoo.org/~blueness/musl-misc/getconf.c
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-02-14 17:09 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2021-02-14 17:09 UTC (permalink / raw
To: gentoo-commits
commit: befbfae1b0e980fcaff16d2936dd4401dfb529be
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:09:33 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:09:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befbfae1
sys-libs/musl: install libssp_nonshared via dolib.a
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r2.ebuild | 2 ++
sys-libs/musl/musl-1.2.2-r2.ebuild | 2 ++
sys-libs/musl/musl-9999.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild b/sys-libs/musl/musl-1.2.1-r2.ebuild
index cfd94b27181..49021690de1 100644
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.1-r2.ebuild
@@ -125,6 +125,8 @@ src_install() {
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
fi
+
+ dolib.a libssp_nonshared.a
}
pkg_postinst() {
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index b6a413c2363..9025fd02109 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -132,6 +132,8 @@ src_install() {
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
fi
+
+ dolib.a libssp_nonshared.a
}
pkg_postinst() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index b6a413c2363..9025fd02109 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -132,6 +132,8 @@ src_install() {
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl
fi
+
+ dolib.a libssp_nonshared.a
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-01-21 15:43 Mike Gilbert
0 siblings, 0 replies; 171+ messages in thread
From: Mike Gilbert @ 2021-01-21 15:43 UTC (permalink / raw
To: gentoo-commits
commit: 281708f47d68c64a06c9d82c9f30e5d1d3c6617f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 15:42:54 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 15:42:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281708f4
sys-libs/musl: grab getent.c from Alpine Linux
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-libs/musl/Manifest | 2 +-
sys-libs/musl/musl-1.2.2-r1.ebuild | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 3178375edc4..79243901162 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -5,4 +5,4 @@ DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
-DIST musl-getent-79d453a0cd3be7dfa4a2e941816e0a820bac085c.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
+DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.2-r1.ebuild b/sys-libs/musl/musl-1.2.2-r1.ebuild
index c7ffebe049b..bbe899d8ce1 100644
--- a/sys-libs/musl/musl-1.2.2-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r1.ebuild
@@ -11,11 +11,11 @@ else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
-GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c"
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c7ffebe049b..bbe899d8ce1 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -11,11 +11,11 @@ else
SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
-GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c"
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
SRC_URI+="
https://dev.gentoo.org/~blueness/musl-misc/getconf.c
- https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
https://dev.gentoo.org/~blueness/musl-misc/iconv.c
"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-01-20 18:02 Mike Gilbert
0 siblings, 0 replies; 171+ messages in thread
From: Mike Gilbert @ 2021-01-20 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 98505d73047f3a7703cd171b1f4f5d8c9e0db4e5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 17:57:48 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 17:58:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98505d73
sys-libs/musl: update getent to support 'shadow' database
Closes: https://bugs.gentoo.org/764755
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
.../{musl-1.2.2.ebuild => musl-1.2.2-r1.ebuild} | 31 +++++++++++++-------
sys-libs/musl/musl-9999.ebuild | 33 ++++++++++++++--------
3 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index c2ab036a470..3178375edc4 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -5,3 +5,4 @@ DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
+DIST musl-getent-79d453a0cd3be7dfa4a2e941816e0a820bac085c.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
diff --git a/sys-libs/musl/musl-1.2.2.ebuild b/sys-libs/musl/musl-1.2.2-r1.ebuild
similarity index 82%
rename from sys-libs/musl/musl-1.2.2.ebuild
rename to sys-libs/musl/musl-1.2.2-r1.ebuild
index c94f8c8198c..c7ffebe049b 100644
--- a/sys-libs/musl/musl-1.2.2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r1.ebuild
@@ -7,18 +7,17 @@ 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="
- 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=""
else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
+GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
export CBUILD=${CBUILD:-${CHOST}}
export CTARGET=${CTARGET:-${CHOST}}
@@ -60,6 +59,18 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ unpack "${P}.tar.gz"
+ fi
+ mkdir misc || die
+ cp "${DISTDIR}"/getconf.c misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c misc/iconv.c || die
+}
+
src_configure() {
tc-getCC ${CTARGET}
just_headers && export CC=true
@@ -84,7 +95,7 @@ src_compile() {
CFLAGS="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- VPATH="${DISTDIR}"
+ VPATH="${WORKDIR}/misc"
fi
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index a4f0d0fe5f8..c7ffebe049b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,24 +1,23 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
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="
- 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=""
else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
+GETENT_COMMIT="79d453a0cd3be7dfa4a2e941816e0a820bac085c"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+ https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+ https://raw.githubusercontent.com/floppym/aports/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+ https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
export CBUILD=${CBUILD:-${CHOST}}
export CTARGET=${CTARGET:-${CHOST}}
@@ -60,6 +59,18 @@ pkg_setup() {
fi
}
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ unpack "${P}.tar.gz"
+ fi
+ mkdir misc || die
+ cp "${DISTDIR}"/getconf.c misc/getconf.c || die
+ cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die
+ cp "${DISTDIR}"/iconv.c misc/iconv.c || die
+}
+
src_configure() {
tc-getCC ${CTARGET}
just_headers && export CC=true
@@ -84,7 +95,7 @@ src_compile() {
CFLAGS="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- VPATH="${DISTDIR}"
+ VPATH="${WORKDIR}/misc"
fi
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-01-20 9:09 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2021-01-20 9:09 UTC (permalink / raw
To: gentoo-commits
commit: cd978112c24ca46b82aadaa2111a0b443b652819
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 09:09:07 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 09:09:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd978112
sys-libs/musl: drop stray CVE-2020-28928 patch
Fix-by: Alpha Bravo
Closes: https://bugs.gentoo.org/766252
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/musl/musl-1.2.2.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2.ebuild b/sys-libs/musl/musl-1.2.2.ebuild
index 393a73ebfeb..c94f8c8198c 100644
--- a/sys-libs/musl/musl-1.2.2.ebuild
+++ b/sys-libs/musl/musl-1.2.2.ebuild
@@ -37,10 +37,6 @@ IUSE="headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2020-28928.patch"
-)
-
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-01-19 21:56 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2021-01-19 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 2b1af680d5afaa6c5b11302e531d784996bc15f7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 21:14:39 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 21:56:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1af680
sys-libs/musl: version bump to 1.2.2
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.2.2.ebuild | 133 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b395b0fd819..c2ab036a470 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,3 +4,4 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
+DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
diff --git a/sys-libs/musl/musl-1.2.2.ebuild b/sys-libs/musl/musl-1.2.2.ebuild
new file mode 100644
index 00000000000..393a73ebfeb
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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 ~ppc64 ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+PATCHES=(
+ "${FILESDIR}/${P}-CVE-2020-28928.patch"
+)
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+src_configure() {
+ tc-getCC ${CTARGET}
+ just_headers && export CC=true
+
+ local sysroot
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
+ ./configure \
+ --target=${CTARGET} \
+ --prefix=${sysroot}/usr \
+ --syslibdir=${sysroot}/lib \
+ --disable-gcc-wrapper || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ emake -C "${T}" getconf getent iconv \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ VPATH="${DISTDIR}"
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2021-01-03 18:58 Fabian Groffen
0 siblings, 0 replies; 171+ messages in thread
From: Fabian Groffen @ 2021-01-03 18:58 UTC (permalink / raw
To: gentoo-commits
commit: e9a367c1fa24e219d5508a0969b7c0f4a3176479
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 18:58:20 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 18:58:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a367c1
sys-libs/musl: prefix sysroot, bug #755071
Closes: https://bugs.gentoo.org/755071
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r1.ebuild | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.1-r1.ebuild b/sys-libs/musl/musl-1.2.1-r1.ebuild
index b380f8294d3..d433abdd339 100644
--- a/sys-libs/musl/musl-1.2.1-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -69,7 +69,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix=${sysroot}/usr \
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 170c94aedcf..a4f0d0fe5f8 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -65,7 +65,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix=${sysroot}/usr \
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-12-06 21:21 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-12-06 21:21 UTC (permalink / raw
To: gentoo-commits
commit: d0372a08d89ea01077f15d9fd35918c3874d5275
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 6 21:21:19 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 21:21:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0372a08
sys-libs/musl: 1.2.1-r1 stable on all arches, bug #755695
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1-r1.ebuild b/sys-libs/musl/musl-1.2.1-r1.ebuild
index 9cf0e5189c1..b380f8294d3 100644
--- a/sys-libs/musl/musl-1.2.1-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.1-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 ~ppc64 x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-11-30 14:21 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-11-30 14:21 UTC (permalink / raw
To: gentoo-commits
commit: d52eb9a94a0f338364e69f985d9a927ce7731f6b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 14:21:19 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 14:21:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52eb9a9
sys-libs/musl: 1.2.1-r1 stable on arm64
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1-r1.ebuild b/sys-libs/musl/musl-1.2.1-r1.ebuild
index a89b5e4ff91..9cf0e5189c1 100644
--- a/sys-libs/musl/musl-1.2.1-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.1-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 ~ppc64 x86"
+ KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ~ppc64 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-11-30 0:06 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-11-30 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 788672679c0a2e6a081f139619e26d0a0c0491fd
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 00:06:10 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 00:06:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78867267
sys-libs/musl: 1.2.1-r1 stable on x86
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1-r1.ebuild b/sys-libs/musl/musl-1.2.1-r1.ebuild
index f8d3bb630ea..a89b5e4ff91 100644
--- a/sys-libs/musl/musl-1.2.1-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.1-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 ~ppc64 ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-11-27 20:57 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-11-27 20:57 UTC (permalink / raw
To: gentoo-commits
commit: e2b82f22eec040025a8a328847db3bccdb9919f9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 20:57:39 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 20:57:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b82f22
sys-libs/musl: 1.2.1-r1 stable on amd64
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1-r1.ebuild b/sys-libs/musl/musl-1.2.1-r1.ebuild
index 05a55e96e2d..f8d3bb630ea 100644
--- a/sys-libs/musl/musl-1.2.1-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.1-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 ~ppc64 ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-08-20 13:15 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-08-20 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 4c21198a1796ae4f831fb33bfd6c522f0fbd0b5e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:14:39 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:14:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c21198a
sys-libs/musl: 1.2.1 stable on amd64 and x86
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.2.1.ebuild b/sys-libs/musl/musl-1.2.1.ebuild
index 7467121249b..69c39b164c3 100644
--- a/sys-libs/musl/musl-1.2.1.ebuild
+++ b/sys-libs/musl/musl-1.2.1.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 ~ppc64 ~x86"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-08-06 14:38 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-08-06 14:38 UTC (permalink / raw
To: gentoo-commits
commit: bbb0563c08cc1cbb873a5807599de87bd9cdc79b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 14:38:44 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 14:38:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb0563c
sys-libs/musl: version bump to 1.2.1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.2.1.ebuild | 129 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index abcb1a03efe..b395b0fd819 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
+DIST musl-1.2.1.tar.gz 1047481 BLAKE2B 5ccdee248d4caa1b433ab9c56cce3842fb46a269fd6a53d0880ba5eaad208997306e6b56fd345917e5076714fbfac0804ea226e6dc3f0f2e75f8c824a7155535 SHA512 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
diff --git a/sys-libs/musl/musl-1.2.1.ebuild b/sys-libs/musl/musl-1.2.1.ebuild
new file mode 100644
index 00000000000..7467121249b
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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 ~ppc64 ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ if [[ ${CATEGORY} != cross-* ]] ; then
+ emake -C "${T}" getconf getent iconv \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ VPATH="${DISTDIR}"
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-05-25 9:22 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2020-05-25 9:22 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-05-20 22:12 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2020-05-20 22:12 UTC (permalink / raw
To: gentoo-commits
commit: a9b1dd3546c9849e5e342d246bdddea95c00dd2a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 22:06:40 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed May 20 22:12:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b1dd35
sys-libs/musl: extract $(ARCH)$(SUBARCH) from config.mak
Closes: https://bugs.gentoo.org/642612
Closes: https://bugs.gentoo.org/645626
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 6 +++++-
sys-libs/musl/musl-1.2.0.ebuild | 6 +++++-
sys-libs/musl/musl-9999.ebuild | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 7948e4dbf5b..453281e19f2 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -98,7 +98,11 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild
index e33c6c80913..6aab4a0a5ec 100644
--- a/sys-libs/musl/musl-1.2.0.ebuild
+++ b/sys-libs/musl/musl-1.2.0.ebuild
@@ -98,7 +98,11 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 50beaf64e1a..dc422c9426b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -98,7 +98,11 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ # Fish out of config:
+ # ARCH = ...
+ # SUBARCH = ...
+ # and print $(ARCH)$(SUBARCH).
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-03-03 1:45 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-03-03 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 7b1c50f1d331f650a72558744dbae4bbbda38ce9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 01:44:05 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 01:44:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1c50f1
sys-libs/musl: remove vulnerable world, bug #711276
Closes: https://bugs.gentoo.org/711276
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.23.ebuild | 122 ---------------------------------------
2 files changed, 123 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index dbf5d17bdfe..abcb1a03efe 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
deleted file mode 100644
index ec3d2f49819..00000000000
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-02-26 3:24 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2020-02-26 3:24 UTC (permalink / raw
To: gentoo-commits
commit: 62ad29557ba726510fc884313b3d3ebda375b459
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 03:20:54 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 03:24:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ad2955
sys-libs/musl: Version bump 1.2.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.2.0.ebuild | 122 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 17ff09bc4a6..dbf5d17bdfe 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
+DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild
new file mode 100644
index 00000000000..e33c6c80913
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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 ~ppc64 ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-02-02 13:04 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2020-02-02 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 1b64c267a9c6ae6e679110732b4eab23dce375b6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 13:02:51 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 13:04:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b64c267
sys-libs/musl: drop 'telinit U' call
Bug: https://bugs.gentoo.org/642784
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/musl/musl-1.1.23.ebuild | 4 +---
sys-libs/musl/musl-1.1.24.ebuild | 2 --
sys-libs/musl/musl-9999.ebuild | 4 +---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 47c54d2eb79..ec3d2f49819 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -119,6 +119,4 @@ pkg_postinst() {
[ "${ROOT}" != "/" ] && return 0
ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
}
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 188ed464c84..7948e4dbf5b 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -119,6 +119,4 @@ pkg_postinst() {
[ "${ROOT}" != "/" ] && return 0
ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9c1ddb9d501..50beaf64e1a 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -119,6 +119,4 @@ pkg_postinst() {
[ "${ROOT}" != "/" ] && return 0
ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-01-30 2:06 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-01-30 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 931d4b0d870f9db8e9fd8be9e38ee7a25f7a8ecb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 02:04:16 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 02:04:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931d4b0d
sys-libs/musl: keyword ~ppc64
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index e6595cccd38..88c9f2a7651 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.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}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-01-30 2:06 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-01-30 2:06 UTC (permalink / raw
To: gentoo-commits
commit: f9af1c96cd70a4881487de9ea064cc674014257f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 02:06:26 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 02:06:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9af1c96
sys-libs/musl: 1.1.24 stable on ppc/ppc64
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 88c9f2a7651..188ed464c84 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.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 ~ppc64 x86"
+ KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-01-05 19:56 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-01-05 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 1b60414e1723dca18740a604bd13305d83ea641f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 19:56:30 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 19:56:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b60414e
sys-libs/musl: remove older version
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.22.ebuild | 124 ---------------------------------------
2 files changed, 125 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 4d58c806107..17ff09bc4a6 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
deleted file mode 100644
index 47c54d2eb79..00000000000
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2020-01-05 19:23 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2020-01-05 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 84d15adaee6303e171c13c1c435fbeafd8861a8d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 19:22:57 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 19:23:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d15ada
sys-libs/musl: 1.1.24 stable on arm
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index eb606361910..e6595cccd38 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-11-22 17:17 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-11-22 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 439ba06135e7755843c1121045e6fa53c71ddec9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 17:16:52 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 17:16:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439ba061
sys-libs/musl: 1.1.24 stable on arm64
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 19c1029a045..36f4183156b 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-11-17 16:58 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-11-17 16:58 UTC (permalink / raw
To: gentoo-commits
commit: 80b553ca46d74e5d4dbb14866523c3e0512d9ca4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 16:58:08 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 16:58:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b553ca
sys-libs/musl: 1.1.24 stable on amd64 and x86
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 0827b9d412b..19c1029a045 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-11-10 1:30 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-11-10 1:30 UTC (permalink / raw
To: gentoo-commits
commit: f18163aad71cab04c02fe41d5a0b8003f8185516
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 01:29:42 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 01:30:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18163aa
sys-libs/musl: 1.1.23 stable on arm and ppc
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.23.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 36f4183156b..129c8302022 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-10-14 13:57 Jory Pratt
0 siblings, 0 replies; 171+ messages in thread
From: Jory Pratt @ 2019-10-14 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 6a71f421d0bcb7de49899bdfb56523bcef88a62e
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 13:56:52 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 13:57:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a71f421
sys-libs/musl: Version bump to 1.1.24
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.24.ebuild | 124 +++++++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index ab80508cbad..4d58c806107 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
+DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
new file mode 100644
index 00000000000..0827b9d412b
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-08 20:41 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-08 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 17e1f6f09229bd0c782416aadee28d2c8f2db72b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 20:41:22 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 20:41:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e1f6f0
sys-libs/musl: 1.1.23 stable on arm64
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.23.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 19c1029a045..36f4183156b 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-07 14:26 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-07 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 7 14:22:27 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 14:26:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f46d10f
Revert "sys-libs/musl: back out of b94c385"
This reverts commit d3b662a5b4d652def877bc1ee55086182ee1c7c6.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.22.ebuild | 6 ++++++
sys-libs/musl/musl-1.1.23.ebuild | 6 ++++++
sys-libs/musl/musl-9999.ebuild | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 7db3e1cc384..129c8302022 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 455b845402c..19c1029a045 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 22f16fa8bfb..0827b9d412b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+
+ # fix for #667126, copied from glibc ebuild
+ # make sure host make.conf doesn't pollute us
+ if is_crosscompile || tc-is-cross-compiler ; then
+ CHOST=${CTARGET} strip-unsupported-flags
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-03 14:40 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-03 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 043576cfd4b6f0e2f08f28d519be07bab473480e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 14:40:20 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 14:40:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043576cf
sys-libs/musl: 1.1.23 stable on amd64 and x86
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.23.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 22f16fa8bfb..455b845402c 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-03 11:18 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-03 11:18 UTC (permalink / raw
To: gentoo-commits
commit: d3b662a5b4d652def877bc1ee55086182ee1c7c6
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 11:17:56 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 11:18:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b662a5
sys-libs/musl: back out of b94c385
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.22.ebuild | 6 ------
sys-libs/musl/musl-1.1.23.ebuild | 6 ------
sys-libs/musl/musl-9999.ebuild | 6 ------
3 files changed, 18 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 129c8302022..7db3e1cc384 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -52,12 +52,6 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 0827b9d412b..22f16fa8bfb 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -52,12 +52,6 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
}
src_configure() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 0827b9d412b..22f16fa8bfb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -52,12 +52,6 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-09-03 11:18 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-09-03 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 8f15cbafb2aba7eb42ae1af9b2a12c0cb9c96cd8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 11:14:17 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 11:18:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f15cbaf
sys-libs/musl: remove older versions
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/Manifest | 2 -
sys-libs/musl/musl-1.1.20-r1.ebuild | 129 ------------------------------------
sys-libs/musl/musl-1.1.21.ebuild | 124 ----------------------------------
3 files changed, 255 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 71db0a9abd6..ab80508cbad 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,7 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
-DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
deleted file mode 100644
index f53b3b492f0..00000000000
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-fix-getaddrinfo.patch"
- eapply_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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
deleted file mode 100644
index 1f4e2584ce7..00000000000
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-
- # fix for #667126, copied from glibc ebuild
- # make sure host make.conf doesn't pollute us
- if is_crosscompile || tc-is-cross-compiler ; then
- CHOST=${CTARGET} strip-unsupported-flags
- fi
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-07-18 17:23 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-07-18 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 8d0162c28db142b3987aaebfd1d401cedcc148ba
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:23:13 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:23:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0162c2
sys-libs/musl: version bump to 1.1.23
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.23.ebuild | 118 +++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 60cde385e12..71db0a9abd6 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,3 +4,4 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b
DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
+DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
new file mode 100644
index 00000000000..22f16fa8bfb
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-05-12 23:47 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-05-12 23:47 UTC (permalink / raw
To: gentoo-commits
commit: cbc7dab2387c8bd38ba2619cc139e3b679b534dd
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 23:46:48 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 12 23:46:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc7dab2
sys-libs/musl: 1.1.22 stable on ppc
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/musl-1.1.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 7ce0d5e96bc..7db3e1cc384 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-04-28 19:44 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-04-28 19:44 UTC (permalink / raw
To: gentoo-commits
commit: bc8d12d3bbf48a30dec2962372baba4e92d9c798
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 19:43:56 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 19:44:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8d12d3
sys-libs/musl: 1.1.22 stable on arm
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/musl-1.1.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 38bdb951f6f..7ce0d5e96bc 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-04-14 15:43 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-04-14 15:43 UTC (permalink / raw
To: gentoo-commits
commit: 2626ddb1e15b821dce14380afe3003346d8c0b3c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 15:42:39 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 15:43:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2626ddb1
sys-libs/musl: 1.1.22 stable on amd64, aarch64 and x86
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/musl-1.1.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 22f16fa8bfb..38bdb951f6f 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-04-10 19:53 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-04-10 19:53 UTC (permalink / raw
To: gentoo-commits
commit: b4efe64b251c68c9809124e1d848bac741d588a1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 19:53:29 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 19:53:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4efe64b
sys-libs/musl: version bump to 1.1.22
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.22.ebuild | 118 +++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index cdbdd35d7e7..60cde385e12 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
+DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
new file mode 100644
index 00000000000..22f16fa8bfb
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-04-06 20:15 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-04-06 20:15 UTC (permalink / raw
To: gentoo-commits
commit: edd4ad9f83d59033174060e8ccba2a6390071019
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 6 20:14:44 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 6 20:15:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd4ad9f
sys-libs/musl: 1.1.21 stable on arm64
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/musl-1.1.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index 5c38c07f18a..7ce0d5e96bc 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-03-31 14:57 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-03-31 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 1350bafa985d3570fdb6315e021be34848b4c8fa
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 14:56:40 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 14:56:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1350bafa
sys-libs/musl: version 1.1.21 stable on arm
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-libs/musl/musl-1.1.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index 455b845402c..5c38c07f18a 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-02-02 17:28 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2019-02-02 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 31bd62cbefd3776ed78bb31d9241a80dddef0348
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 2 17:28:29 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 2 17:28:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bd62cb
sys-libs/musl: fix metadata.xml indentation
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/musl/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml
index cd4b91b3e67..d74962a333b 100644
--- a/sys-libs/musl/metadata.xml
+++ b/sys-libs/musl/metadata.xml
@@ -8,7 +8,7 @@
<maintainer type="person">
<email>lu_zero@gentoo.org</email>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
^ permalink raw reply related [flat|nested] 171+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-01-27 16:13 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-01-27 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 428a1fdf31e896a7bb48e41076a593e734359e0c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 16:12:47 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 16:12:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428a1fdf
sys-libs/musl: version 1.1.21 stable on amd64 and x86
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-libs/musl/musl-1.1.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index 22f16fa8bfb..455b845402c 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-01-27 15:59 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-01-27 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 5476ecd5c13f1fddd6ba6a5b1cfebe67bd9cedfc
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 15:59:23 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 15:59:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5476ecd5
sys-libs/musl: drop back to EAPI=6
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-libs/musl/musl-1.1.21.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index c2bf734321d..22f16fa8bfb 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c2bf734321d..22f16fa8bfb 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-01-27 12:44 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-01-27 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 75304fb90d4c8e9b0a2ce1ae59bf79d1f751ebc5
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 12:43:30 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 12:43:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75304fb9
sys-libs/musl: version bump to 1.1.21
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-libs/musl/Manifest | 1 +
sys-libs/musl/{musl-9999.ebuild => musl-1.1.21.ebuild} | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b2680492ffb..e6946522233 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
+DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
similarity index 98%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.1.21.ebuild
index c9d12c96192..c2bf734321d 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.1.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c9d12c96192..c2bf734321d 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2019-01-27 12:44 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2019-01-27 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 82ca8b2adef3838777a594acecc6c27637ec4985
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 12:44:17 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 12:44:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ca8b2a
sys-libs/musl: remove older versions
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.19.ebuild | 118 ---------------------------------------
sys-libs/musl/musl-1.1.20.ebuild | 118 ---------------------------------------
3 files changed, 237 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index e6946522233..cdbdd35d7e7 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +1,5 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
deleted file mode 100644
index 9c2f1c169cf..00000000000
--- a/sys-libs/musl/musl-1.1.19.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.20.ebuild b/sys-libs/musl/musl-1.1.20.ebuild
deleted file mode 100644
index 768c9e7412d..00000000000
--- a/sys-libs/musl/musl-1.1.20.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-12-31 18:26 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-12-31 18:26 UTC (permalink / raw
To: gentoo-commits
commit: d5b21e35f06d3dc3dfafd18016958a3ed8b07ffb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 18:26:28 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 18:26:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b21e35
sys-libs/musl: 1.1.20-r1 stable on arm ppc
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-libs/musl/musl-1.1.20-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
index f336112e379..13a18acc702 100644
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-10-04 21:39 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-10-04 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 9d54dd73859994b85ad1d1d28236c1849ddaecce
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 4 21:39:25 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 4 21:39:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d54dd73
sys-libs/musl: version 1.1.20-r1 stable on amd64 and x86
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sys-libs/musl/musl-1.1.20-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
index cba85ae6bb6..f336112e379 100644
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.20-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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-09-13 18:56 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-09-13 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 1fcdec4a18ad06413cd7dd48bfe46e0ae0f12e33
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 18:56:27 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 18:56:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fcdec4a
sys-libs/musl: version 1.1.20 stable on x86
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/musl-1.1.20.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.20.ebuild b/sys-libs/musl/musl-1.1.20.ebuild
index 52b13b6bca9..768c9e7412d 100644
--- a/sys-libs/musl/musl-1.1.20.ebuild
+++ b/sys-libs/musl/musl-1.1.20.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-09-13 2:24 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-09-13 2:24 UTC (permalink / raw
To: gentoo-commits
commit: 23ba0d33e698486c1a2e56c162bd2246b28a1449
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 02:23:17 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 02:23:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ba0d33
sys-libs/musl: version 1.1.20 stable on amd64
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/musl-1.1.20.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.20.ebuild b/sys-libs/musl/musl-1.1.20.ebuild
index c9d12c96192..52b13b6bca9 100644
--- a/sys-libs/musl/musl-1.1.20.ebuild
+++ b/sys-libs/musl/musl-1.1.20.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 ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-09-12 21:28 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-09-12 21:28 UTC (permalink / raw
To: gentoo-commits
commit: d91136790b799a2492b7d185d874f6eed60be08b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 21:28:16 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 21:28:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9113679
sys-libs/musl: version bump to 1.1.20
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.20.ebuild | 118 +++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index ee29fa7fe65..b2680492ffb 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,3 +2,4 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
+DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
diff --git a/sys-libs/musl/musl-1.1.20.ebuild b/sys-libs/musl/musl-1.1.20.ebuild
new file mode 100644
index 00000000000..c9d12c96192
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.20.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-08-02 23:31 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-08-02 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 78ddd9e93bf5943de5f51b91b15fd5bbd88d8894
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 2 23:30:47 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 23:30:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ddd9e9
sys-libs/musl: stable on arm64
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/musl-1.1.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
index 9dafc901ca5..9c2f1c169cf 100644
--- a/sys-libs/musl/musl-1.1.19.ebuild
+++ b/sys-libs/musl/musl-1.1.19.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 x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-08-02 23:13 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-08-02 23:13 UTC (permalink / raw
To: gentoo-commits
commit: d024ef29e98fa96cac267601253a4a4b447107ac
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 2 23:13:32 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 23:13:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d024ef29
sys-libs/musl: remove older stable version
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.18.ebuild | 118 ---------------------------------------
2 files changed, 119 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 795b389167e..ee29fa7fe65 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,5 +1,4 @@
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
deleted file mode 100644
index e36e2199458..00000000000
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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 ~mips ppc x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
- use 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
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-08-02 23:13 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-08-02 23:13 UTC (permalink / raw
To: gentoo-commits
commit: c3245e3a3859405a1514aae448eb44919f11406e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 2 23:12:38 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 2 23:12:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3245e3a
sys-libs/musl: keyword ~arm64
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-libs/musl/musl-1.1.19.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
index e36e2199458..9dafc901ca5 100644
--- a/sys-libs/musl/musl-1.1.19.ebuild
+++ b/sys-libs/musl/musl-1.1.19.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 ~mips ppc x86"
+ KEYWORDS="-* amd64 arm ~arm64 ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 991afd750a8..c9d12c96192 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 ~mips ~ppc ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-03-04 0:37 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-03-04 0:37 UTC (permalink / raw
To: gentoo-commits
commit: c391870835a7a5a7b56b4afb8fdb33ce2f481754
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 00:37:10 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 4 00:37:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3918708
sys-libs/musl: 1.1.19 stable on all supported arches
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-libs/musl/musl-1.1.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
index 991afd750a8..e36e2199458 100644
--- a/sys-libs/musl/musl-1.1.19.ebuild
+++ b/sys-libs/musl/musl-1.1.19.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 ~mips ~ppc ~x86"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-02-23 16:08 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-02-23 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 4069fd7670533ded9a91933243ed335e19cafcb0
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 16:08:15 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 16:08:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4069fd76
sys-libs/musl: version bump to 1.1.19
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.19.ebuild | 118 +++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 8bd911b728f..795b389167e 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,3 +2,4 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
+DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
new file mode 100644
index 00000000000..991afd750a8
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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 ~mips ~ppc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+ use 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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ 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
+ fi
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-01-07 19:39 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2018-01-07 19:39 UTC (permalink / raw
To: gentoo-commits
commit: d0bf3364d7179e707a55f502c2e760a2daafb5db
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 18:42:56 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 19:39:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bf3364
sys-libs/musl: Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only
CROSSCOMPILE_OPTS is a USE_EXPAND of a single item: headers-only.
Convert it to a global USE flag instead.
Mechanical ebuild rename done as:
$ sed -e 's@crosscompile_opts_headers-only@headers-only@g' \
-i $(git grep -l headers-only)
'headers-only' flag is used by crossdev to bootstrap stage1 compiler
before libc is available.
crossdev switched to USE=headers-only in =sys-devel/crossdev-20171230.
Bug: https://bugs.gentoo.org/642712
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-libs/musl/musl-1.1.18.ebuild | 6 +++---
sys-libs/musl/musl-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
index a36df0d0e87..e36e2199458 100644
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ b/sys-libs/musl/musl-1.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a
HOMEPAGE="http://www.musl-libc.org/"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
@@ -42,7 +42,7 @@ is_crosscompile() {
}
just_headers() {
- use crosscompile_opts_headers-only && is_crosscompile
+ use headers-only && is_crosscompile
}
pkg_setup() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9e0e184d656..991afd750a8 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a
HOMEPAGE="http://www.musl-libc.org/"
LICENSE="MIT LGPL-2 GPL-2"
SLOT="0"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
QA_SONAME="/usr/lib/libc.so"
QA_DT_NEEDED="/usr/lib/libc.so"
@@ -42,7 +42,7 @@ is_crosscompile() {
}
just_headers() {
- use crosscompile_opts_headers-only && is_crosscompile
+ use headers-only && is_crosscompile
}
pkg_setup() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2018-01-01 9:59 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2018-01-01 9:59 UTC (permalink / raw
To: gentoo-commits
commit: f8952fa97a5120a8d02b4e565e5a48d6f314e534
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 09:56:45 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 09:59:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8952fa9
Revert "sys-libs/musl: prefixify build"
This reverts commit 0fcf2e327095c1329a4044950cadfda036db8245.
More testing is required before we commit to this.
sys-libs/musl/musl-1.1.18-r1.ebuild | 118 ------------------------------------
sys-libs/musl/musl-9999.ebuild | 4 +-
2 files changed, 2 insertions(+), 120 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.18-r1.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild
deleted file mode 100644
index c4a1c90aaf5..00000000000
--- a/sys-libs/musl/musl-1.1.18-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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 ~mips ~ppc ~x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-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
-}
-
-src_configure() {
- tc-getCC ${CTARGET}
- just_headers && export CC=true
-
- local sysroot
- is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
- ./configure \
- --target=${CTARGET} \
- --prefix=${sysroot}/usr \
- --syslibdir=${sysroot}/lib \
- --disable-gcc-wrapper || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- 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
- fi
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 "${ED}"${sysroot}/lib/ld-musl-*)
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
- if [[ ${CATEGORY} != cross-* ]] ; then
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c4a1c90aaf5..9e0e184d656 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -59,7 +59,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
+ is_crosscompile && sysroot=/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix=${sysroot}/usr \
@@ -88,7 +88,7 @@ src_install() {
# musl provides ldd via a sym link to its ld.so
local sysroot
is_crosscompile && sysroot=/usr/${CTARGET}
- local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
+ local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-12-29 18:22 Sergei Trofimovich
0 siblings, 0 replies; 171+ messages in thread
From: Sergei Trofimovich @ 2017-12-29 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 0fcf2e327095c1329a4044950cadfda036db8245
Author: Marty E. Plummer <hanetzer <AT> protonmail <DOT> com>
AuthorDate: Fri Dec 29 11:02:09 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 18:21:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcf2e32
sys-libs/musl: prefixify build
Currently building a musl libc toolchain inside of gentoo prefix with
crossdev will fail, due to installing files outside of the prefix. Added
${EPREFIX} and ${ED} where apropriate fixed this issue.
Tested in a prefix with toolchain x86_64-gentoo-linux-musl, and tested on bare
gentoo with x86_64-gentoo-linux-musl.
Acked-by: blueness
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Signed-off-by: Marty E. Plummer <hanetzer <AT> protonmail.com>
Closes: https://bugs.gentoo.org/642612
Closes: https://github.com/gentoo/gentoo/pull/6678
sys-libs/musl/{musl-9999.ebuild => musl-1.1.18-r1.ebuild} | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild
similarity index 96%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.1.18-r1.ebuild
index 9e0e184d656..c4a1c90aaf5 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.1.18-r1.ebuild
@@ -59,7 +59,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix=${sysroot}/usr \
@@ -88,7 +88,7 @@ src_install() {
# 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-*)
+ local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9e0e184d656..c4a1c90aaf5 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -59,7 +59,7 @@ src_configure() {
just_headers && export CC=true
local sysroot
- is_crosscompile && sysroot=/usr/${CTARGET}
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET}
./configure \
--target=${CTARGET} \
--prefix=${sysroot}/usr \
@@ -88,7 +88,7 @@ src_install() {
# 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-*)
+ local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-11-27 14:46 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-11-27 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 645725bafeaf6db41f09cc458a36555b0be1d849
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 14:46:35 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 14:46:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645725ba
sys-libs/musl: remove vulnerable version, bug #636060
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.16.ebuild | 116 ---------------------------------------
2 files changed, 117 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index e48791002ac..1cc0d3bfe6e 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,5 +1,4 @@
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.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
DIST musl-1.1.18.tar.gz 936274 SHA256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c WHIRLPOOL ac1fbf970d501a51fb8e9d6215ea52cb2989446cea11d40c21bbd7ecaf6585c6616fb27ad4b6d21d6a3d1ff79854593a3bfd22b4ea0e35f499d3180a74aacd47
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
deleted file mode 100644
index 8daacd87f05..00000000000
--- a/sys-libs/musl/musl-1.1.16.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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="-* ppc"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-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
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- $(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
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-11-27 14:46 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-11-27 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 8f9e5d281e87d06cb0a00b5b46620b398a4c6d1b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 14:46:04 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 14:46:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9e5d28
sys-libs/musl: 1.1.18 stable on ppc
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-libs/musl/musl-1.1.18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
index 92d19eaa51e..a36df0d0e87 100644
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ b/sys-libs/musl/musl-1.1.18.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 ~mips ~ppc x86"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-11-12 13:51 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-11-12 13:51 UTC (permalink / raw
To: gentoo-commits
commit: ea520ab54d1763c83160498b40c175388c144e70
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 13:51:10 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 13:51:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea520ab5
sys-libs/musl: arm stable on 1.1.18
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/musl-1.1.16.ebuild | 2 +-
sys-libs/musl/musl-1.1.18.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
index 497fb924b5a..8daacd87f05 100644
--- a/sys-libs/musl/musl-1.1.16.ebuild
+++ b/sys-libs/musl/musl-1.1.16.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="-* arm ppc"
+ KEYWORDS="-* ppc"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
index bc371ec602b..92d19eaa51e 100644
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ b/sys-libs/musl/musl-1.1.18.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 ~mips ~ppc x86"
+ KEYWORDS="-* amd64 arm ~mips ~ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-11-02 1:07 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-11-02 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 8946b320785d19ebc66ebece3ed47077e56d7c3c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 01:05:49 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 01:07:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8946b320
sys-libs/musl: version bump to 1.1.18, drop 1.1.17
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/Manifest | 2 +-
sys-libs/musl/{musl-1.1.17.ebuild => musl-1.1.18.ebuild} | 10 ++++++----
sys-libs/musl/musl-9999.ebuild | 8 +++++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 6f35b19af5e..e48791002ac 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,4 +2,4 @@ DIST getconf.c 11614 SHA256 d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae5
DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 WHIRLPOOL 473e54a9158e70c411f4c84e590bcfd245051212a3346a3c6dd45df9f09a5fbccbc8900ad7f8691eb5ebb8cd1002caf9519abaffb1753175d4f8acb1d32236b4
DIST iconv.c 2577 SHA256 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf WHIRLPOOL 8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc
DIST musl-1.1.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
-DIST musl-1.1.17.tar.gz 936290 SHA256 c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 SHA512 bc99c7d58d64116c03e68fe77141a1f2938e0c01ba027937587a060d435b4b00b8b1f18c63fb8ed445ef36f377974e02a7b4821c793e4292041e31e66f145428 WHIRLPOOL 28cf246578c0a70d29a015a37136c9dda0b891b17048b35e84b2f4bebc47a417cd4dc3e6f7f7b5889393117e00b3f7469355338e44b063f79269824fdda4ffbd
+DIST musl-1.1.18.tar.gz 936274 SHA256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c WHIRLPOOL ac1fbf970d501a51fb8e9d6215ea52cb2989446cea11d40c21bbd7ecaf6585c6616fb27ad4b6d21d6a3d1ff79854593a3bfd22b4ea0e35f499d3180a74aacd47
diff --git a/sys-libs/musl/musl-1.1.17.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
similarity index 90%
rename from sys-libs/musl/musl-1.1.17.ebuild
rename to sys-libs/musl/musl-1.1.18.ebuild
index 4c1f9a4c581..9e0e184d656 100644
--- a/sys-libs/musl/musl-1.1.17.ebuild
+++ b/sys-libs/musl/musl-1.1.18.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 ~mips ~ppc x86"
+ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
@@ -72,9 +72,11 @@ src_compile() {
just_headers && return 0
emake
- $(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
+ 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
+ fi
}
src_install() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 4b53b12d810..9e0e184d656 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -72,9 +72,11 @@ src_compile() {
just_headers && return 0
emake
- $(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
+ 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
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-11-02 1:07 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-11-02 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 7873d9742bcfa5f6de8ba06666c2527fe0ea282e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 01:06:52 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 01:07:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7873d974
sys-libs/musl: stable on amd64 and x86, bug #636060
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/musl-1.1.18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
index 9e0e184d656..bc371ec602b 100644
--- a/sys-libs/musl/musl-1.1.18.ebuild
+++ b/sys-libs/musl/musl-1.1.18.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 ~mips ~ppc ~x86"
+ KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-10-31 20:39 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-10-31 20:39 UTC (permalink / raw
To: gentoo-commits
commit: e4f7634e26ced285636cf825b455855580e7141a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 20:38:52 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 20:38:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f7634e
sys-libs/musl: drop keywords as much as possible previous to 1.1.17, bug #636060
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.15-r2.ebuild | 121 ------------------------------------
sys-libs/musl/musl-1.1.16.ebuild | 2 +-
3 files changed, 1 insertion(+), 123 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 336a4e0f877..6f35b19af5e 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +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.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf
DIST musl-1.1.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
DIST musl-1.1.17.tar.gz 936290 SHA256 c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 SHA512 bc99c7d58d64116c03e68fe77141a1f2938e0c01ba027937587a060d435b4b00b8b1f18c63fb8ed445ef36f377974e02a7b4821c793e4292041e31e66f145428 WHIRLPOOL 28cf246578c0a70d29a015a37136c9dda0b891b17048b35e84b2f4bebc47a417cd4dc3e6f7f7b5889393117e00b3f7469355338e44b063f79269824fdda4ffbd
diff --git a/sys-libs/musl/musl-1.1.15-r2.ebuild b/sys-libs/musl/musl-1.1.15-r2.ebuild
deleted file mode 100644
index 38374a82349..00000000000
--- a/sys-libs/musl/musl-1.1.15-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="
- 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=""
-else
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
- 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 ~mips ppc x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-PATCHES=(
- "${FILESDIR}/${P}-assert.patch"
- "${FILESDIR}/${P}-CVE.patch"
- )
-
-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
-}
-
-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 || die
-}
-
-src_compile() {
- emake obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
- $(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
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
- cp "${FILESDIR}"/ldconfig.in "${T}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig || die
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
index af34891af2d..497fb924b5a 100644
--- a/sys-libs/musl/musl-1.1.16.ebuild
+++ b/sys-libs/musl/musl-1.1.16.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 ~mips ppc x86"
+ KEYWORDS="-* arm ppc"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-10-31 20:35 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-10-31 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 4418165f29caf6baf4254f681bab68efa953e9cc
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 20:34:50 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 20:35:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4418165f
sys-libs/musl: 1.1.17 stable on amd64 and x86, bug #636060
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/musl-1.1.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.17.ebuild b/sys-libs/musl/musl-1.1.17.ebuild
index 4b53b12d810..4c1f9a4c581 100644
--- a/sys-libs/musl/musl-1.1.17.ebuild
+++ b/sys-libs/musl/musl-1.1.17.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 ~mips ~ppc ~x86"
+ KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-10-20 23:38 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-10-20 23:38 UTC (permalink / raw
To: gentoo-commits
commit: b79b29a2dc1c0b0c038ebedaca7c6b96b5b842f8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 23:37:36 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 23:38:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79b29a2
sys-libs/musl: version bump to 1.1.17
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.17.ebuild | 116 +++++++++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index a441c617ba4..336a4e0f877 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd
DIST iconv.c 2577 SHA256 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf WHIRLPOOL 8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc
DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf
DIST musl-1.1.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
+DIST musl-1.1.17.tar.gz 936290 SHA256 c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 SHA512 bc99c7d58d64116c03e68fe77141a1f2938e0c01ba027937587a060d435b4b00b8b1f18c63fb8ed445ef36f377974e02a7b4821c793e4292041e31e66f145428 WHIRLPOOL 28cf246578c0a70d29a015a37136c9dda0b891b17048b35e84b2f4bebc47a417cd4dc3e6f7f7b5889393117e00b3f7469355338e44b063f79269824fdda4ffbd
diff --git a/sys-libs/musl/musl-1.1.17.ebuild b/sys-libs/musl/musl-1.1.17.ebuild
new file mode 100644
index 00000000000..4b53b12d810
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.17.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+ 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=""
+else
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+ 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 ~mips ~ppc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ $(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
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-09-06 21:00 Michał Górny
0 siblings, 0 replies; 171+ messages in thread
From: Michał Górny @ 2017-09-06 21:00 UTC (permalink / raw
To: gentoo-commits
commit: abedad17ce38f823fe944ee84b7a72bc7054e833
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Sep 3 16:42:31 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 20:59:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abedad17
sys-libs/musl: use HTTPS for links to dev.gentoo.org
sys-libs/musl/musl-1.1.15-r2.ebuild | 14 +++++++-------
sys-libs/musl/musl-1.1.16.ebuild | 12 ++++++------
sys-libs/musl/musl-9999.ebuild | 14 +++++++-------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.15-r2.ebuild b/sys-libs/musl/musl-1.1.15-r2.ebuild
index 9a1d64ae6bf..38374a82349 100644
--- a/sys-libs/musl/musl-1.1.15-r2.ebuild
+++ b/sys-libs/musl/musl-1.1.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,15 +8,15 @@ 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"
+ 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=""
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"
+ 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 ~mips ppc x86"
fi
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
index a70f9ede395..af34891af2d 100644
--- a/sys-libs/musl/musl-1.1.16.ebuild
+++ b/sys-libs/musl/musl-1.1.16.ebuild
@@ -8,15 +8,15 @@ 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"
+ 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=""
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"
+ 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 ~mips ppc x86"
fi
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index e7a564156d4..4b53b12d810 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,15 +8,15 @@ 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"
+ 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=""
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"
+ 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 ~mips ~ppc ~x86"
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-04-23 1:07 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-04-23 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 745cefb2671028348a5f294ee1927814a9dcd201
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 01:07:09 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 01:07:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745cefb2
sys-libs/musl: stabilize on all arches
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-libs/musl/musl-1.1.16.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
index cab7ab35fc0..a70f9ede395 100644
--- a/sys-libs/musl/musl-1.1.16.ebuild
+++ b/sys-libs/musl/musl-1.1.16.ebuild
@@ -17,7 +17,7 @@ else
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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-01-08 23:00 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-01-08 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 78404f8f8ea9b5dde8d59e4fec442c090328ee65
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 22:52:07 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 22:58:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78404f8f
sys-libs/musl: Security cleanup (bug #597498)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-libs/musl/musl-1.1.15.ebuild | 137 ---------------------------------------
1 file changed, 137 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.15.ebuild b/sys-libs/musl/musl-1.1.15.ebuild
deleted file mode 100644
index 52c5992..00000000
--- a/sys-libs/musl/musl-1.1.15.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-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 || die
- $(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
-}
-
-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 obj/include/bits/alltypes.h
- 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() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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
- # TODO: We may be able to simplify this code by obtianing the arch name with
- # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
- 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}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2017-01-01 16:57 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2017-01-01 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 10f1632f704cfed429b2ff539daed6136cb4f793
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 1 16:57:01 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 16:57:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f1632f
sys-libs/musl: version bump to 1.1.16
Package-Manager: portage-2.3.0
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.16.ebuild | 117 +++++++++++++++++++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 67f8d04..a441c61 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -2,3 +2,4 @@ DIST getconf.c 11614 SHA256 d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae5
DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 WHIRLPOOL 473e54a9158e70c411f4c84e590bcfd245051212a3346a3c6dd45df9f09a5fbccbc8900ad7f8691eb5ebb8cd1002caf9519abaffb1753175d4f8acb1d32236b4
DIST iconv.c 2577 SHA256 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf WHIRLPOOL 8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc
DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf
+DIST musl-1.1.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild
new file mode 100644
index 00000000..fc64c20
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.16.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+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
+}
+
+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 || die
+}
+
+src_compile() {
+ emake obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+ $(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
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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 arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ doenvd "${T}"/00musl || die
+ fi
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ [ "${ROOT}" != "/" ] && return 0
+
+ ldconfig || die
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-10-23 9:11 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-10-23 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 218c64d9488be8f3b90646539d536f0c15bc655d
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 09:11:14 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 09:11:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218c64d9
sys-libs/musl: 1.1.15-r2 stable on arm and ppc, bug #597498
Package-Manager: portage-2.2.28
sys-libs/musl/musl-1.1.15-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.15-r2.ebuild b/sys-libs/musl/musl-1.1.15-r2.ebuild
index 51ee85a..518c8d6 100644
--- a/sys-libs/musl/musl-1.1.15-r2.ebuild
+++ b/sys-libs/musl/musl-1.1.15-r2.ebuild
@@ -18,7 +18,7 @@ else
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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-10-20 3:49 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-10-20 3:49 UTC (permalink / raw
To: gentoo-commits
commit: 24ccdf6d87ac9783b641c3d4e1fae9b2dfee81cc
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 03:49:07 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 03:49:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ccdf6d
sys-libs/musl: remove older unstable versions
Package-Manager: portage-2.2.28
sys-libs/musl/Manifest | 2 -
sys-libs/musl/musl-1.1.12.ebuild | 128 ----------------------------------
sys-libs/musl/musl-1.1.14-r2.ebuild | 135 ------------------------------------
sys-libs/musl/musl-1.1.14.ebuild | 131 ----------------------------------
4 files changed, 396 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index dac3d77..67f8d04 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,6 +1,4 @@
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
DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
deleted file mode 100644
index 574b31f..00000000
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-r3
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-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"
-
-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 || die
- $(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
-}
-
-src_prepare() {
- 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
- just_headers && return 0
-
- emake
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${FILESDIR}"/getent
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.14-r2.ebuild b/sys-libs/musl/musl-1.1.14-r2.ebuild
deleted file mode 100644
index 0068d94..00000000
--- a/sys-libs/musl/musl-1.1.14-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crosscompile_opts_headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-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 || die
- $(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
-}
-
-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 obj/include/bits/alltypes.h
- 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() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${T}"/getconf
- dobin "${T}"/getent
- dobin "${T}"/iconv
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- doenvd "${T}"/00musl || die
- fi
-}
-
-pkg_postinst() {
- is_crosscompile && return 0
-
- [ "${ROOT}" != "/" ] && return 0
-
- ldconfig
- # reload init ...
- /sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.14.ebuild b/sys-libs/musl/musl-1.1.14.ebuild
deleted file mode 100644
index 98e65f4..00000000
--- a/sys-libs/musl/musl-1.1.14.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-r3
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-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"
-
-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 || die
- $(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
-}
-
-src_prepare() {
- 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 obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${FILESDIR}"/getent
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-10-20 3:49 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-10-20 3:49 UTC (permalink / raw
To: gentoo-commits
commit: 2aa55039ac9eba4e70d4a10ce1df837ea75426d6
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 03:47:37 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 03:47:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa55039
sys-libs/musl: 1.1.15-r2 stable on amd64 and x86, bug #597498
Package-Manager: portage-2.2.28
sys-libs/musl/musl-1.1.15-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.15-r2.ebuild b/sys-libs/musl/musl-1.1.15-r2.ebuild
index e21f214..51ee85a 100644
--- a/sys-libs/musl/musl-1.1.15-r2.ebuild
+++ b/sys-libs/musl/musl-1.1.15-r2.ebuild
@@ -18,7 +18,7 @@ else
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"
+ KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-09-24 20:15 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-09-24 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 668244297775b0857de355dc77c6cfe2db1fc7c4
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Sep 24 14:12:06 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 20:15:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66824429
sys-libs/musl: add sanity check for ldconfig arch
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/musl/musl-1.1.15-r1.ebuild | 1 +
sys-libs/musl/musl-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sys-libs/musl/musl-1.1.15-r1.ebuild b/sys-libs/musl/musl-1.1.15-r1.ebuild
index ae82136..be22eba 100644
--- a/sys-libs/musl/musl-1.1.15-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.15-r1.ebuild
@@ -92,6 +92,7 @@ src_install() {
if [[ ${CATEGORY} != cross-* ]] ; then
local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index ae82136..be22eba 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -92,6 +92,7 @@ src_install() {
if [[ ${CATEGORY} != cross-* ]] ; then
local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-09-24 13:51 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-09-24 13:51 UTC (permalink / raw
To: gentoo-commits
commit: b37736d745e1ea1bf0e0bc10917dc6f84b21dbe0
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Sep 24 02:41:34 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 13:51:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37736d7
sys-libs/musl: revbump to improve the ldconfig script
Also add some more "|| die".
Gentoo-Bug: https://bugs.gentoo.org/592268
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../{musl-9999.ebuild => musl-1.1.15-r1.ebuild} | 33 ++++------------------
sys-libs/musl/musl-9999.ebuild | 33 ++++------------------
2 files changed, 12 insertions(+), 54 deletions(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.15-r1.ebuild
similarity index 74%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.1.15-r1.ebuild
index 906de18..ae82136 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.1.15-r1.ebuild
@@ -46,17 +46,6 @@ 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 || die
- $(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
@@ -76,7 +65,7 @@ src_configure() {
--target=${CTARGET} \
--prefix=${sysroot}/usr \
--syslibdir=${sysroot}/lib \
- --disable-gcc-wrapper
+ --disable-gcc-wrapper || die
}
src_compile() {
@@ -84,9 +73,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
+ $(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
}
src_install() {
@@ -102,17 +91,7 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- # TODO: We may be able to simplify this code by obtianing the arch name with
- # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
- 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
+ local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
@@ -131,7 +110,7 @@ pkg_postinst() {
[ "${ROOT}" != "/" ] && return 0
- ldconfig
+ ldconfig || die
# reload init ...
/sbin/telinit U 2>/dev/null
}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 906de18..ae82136 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -46,17 +46,6 @@ 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 || die
- $(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
@@ -76,7 +65,7 @@ src_configure() {
--target=${CTARGET} \
--prefix=${sysroot}/usr \
--syslibdir=${sysroot}/lib \
- --disable-gcc-wrapper
+ --disable-gcc-wrapper || die
}
src_compile() {
@@ -84,9 +73,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
+ $(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
}
src_install() {
@@ -102,17 +91,7 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
- # TODO: We may be able to simplify this code by obtianing the arch name with
- # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
- 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
+ local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
cp "${FILESDIR}"/ldconfig.in "${T}" || die
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
@@ -131,7 +110,7 @@ pkg_postinst() {
[ "${ROOT}" != "/" ] && return 0
- ldconfig
+ ldconfig || die
# reload init ...
/sbin/telinit U 2>/dev/null
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-09-20 9:19 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-09-20 9:19 UTC (permalink / raw
To: gentoo-commits
commit: f8bbc86e3b387d943efce36d4c6688c69311e137
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 09:18:44 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 09:18:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bbc86e
sys-libs/musl: version 1.1.15 stable on all arches
Package-Manager: portage-2.2.28
sys-libs/musl/musl-1.1.15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.15.ebuild b/sys-libs/musl/musl-1.1.15.ebuild
index 906de18..52c5992 100644
--- a/sys-libs/musl/musl-1.1.15.ebuild
+++ b/sys-libs/musl/musl-1.1.15.ebuild
@@ -18,7 +18,7 @@ else
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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-07-06 23:42 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-07-06 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 9fee6768dc4188a51c8f588f2e9d835f111e0989
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 23:45:02 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 23:45:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fee6768
sys-libs/musl: version bump to 1.1.15
Package-Manager: portage-2.2.28
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.15.ebuild | 137 +++++++++++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 052ec7f..dac3d77 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,3 +3,4 @@ DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd
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
+DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf
diff --git a/sys-libs/musl/musl-1.1.15.ebuild b/sys-libs/musl/musl-1.1.15.ebuild
new file mode 100644
index 0000000..906de18
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.15.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+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 || die
+ $(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
+}
+
+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 obj/include/bits/alltypes.h
+ 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() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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
+ # TODO: We may be able to simplify this code by obtianing the arch name with
+ # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
+ 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}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-06-05 8:02 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-06-05 8:02 UTC (permalink / raw
To: gentoo-commits
commit: afc99c28266b6f3e49eb246e742f0aedb9193d68
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 08:03:49 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 08:04:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc99c28
sys-libs/musl: correct file location of iconv, getent and getconf
Package-Manager: portage-2.2.28
sys-libs/musl/{musl-1.1.14-r1.ebuild => musl-1.1.14-r2.ebuild} | 6 +++---
sys-libs/musl/musl-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.14-r1.ebuild b/sys-libs/musl/musl-1.1.14-r2.ebuild
similarity index 97%
rename from sys-libs/musl/musl-1.1.14-r1.ebuild
rename to sys-libs/musl/musl-1.1.14-r2.ebuild
index bf1ebe9..0068d94 100644
--- a/sys-libs/musl/musl-1.1.14-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.14-r2.ebuild
@@ -116,9 +116,9 @@ src_install() {
into /
dosbin "${T}"/ldconfig
into /usr
- dosbin "${T}"/getconf
- dosbin "${T}"/getent
- dosbin "${T}"/iconv
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${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 3c6e9c8..906de18 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -118,9 +118,9 @@ src_install() {
into /
dosbin "${T}"/ldconfig
into /usr
- dosbin "${T}"/getconf
- dosbin "${T}"/getent
- dosbin "${T}"/iconv
+ dobin "${T}"/getconf
+ dobin "${T}"/getent
+ dobin "${T}"/iconv
echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl || die
fi
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-06-05 0:39 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-06-05 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 980e1b634d138ee9b711866abdecf11b51d4cbde
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 00:40:47 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 00:40:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980e1b63
sys-libs/musl: add TODO comment wrt obtaining arch name
Package-Manager: portage-2.2.28
sys-libs/musl/musl-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index bf1ebe9..3c6e9c8 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -102,6 +102,8 @@ src_install() {
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
if [[ ${CATEGORY} != cross-* ]] ; then
+ # TODO: We may be able to simplify this code by obtianing the arch name with
+ # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p'
local target=$(tc-arch) arch
local endian=$(musl_endian)
case ${target} in
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-06-05 0:35 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-06-05 0:35 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-22 11:52 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-22 11:52 UTC (permalink / raw
To: gentoo-commits
commit: ba98b4aa281535eb9650e6118c313d3db4cd2e18
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 12:01:58 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 12:02:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba98b4aa
sys-libs/musl: stable on amd64, arm, ppc and x86
Package-Manager: portage-2.2.26
sys-libs/musl/musl-1.1.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.14.ebuild b/sys-libs/musl/musl-1.1.14.ebuild
index 85bdc9b..98e65f4 100644
--- a/sys-libs/musl/musl-1.1.14.ebuild
+++ b/sys-libs/musl/musl-1.1.14.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-22 8:50 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-22 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 301007ece2dfacc07e6802abe32cc2a3388c8341
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 08:59:57 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:59:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301007ec
sys-libs/musl: version bump to 1.1.14
Package-Manager: portage-2.2.26
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.14.ebuild | 131 +++++++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index a4d3803..ffea79c 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1 +1,2 @@
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-1.1.14.ebuild b/sys-libs/musl/musl-1.1.14.ebuild
new file mode 100644
index 0000000..85bdc9b
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.14.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-r3
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+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"
+
+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 || die
+ $(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
+}
+
+src_prepare() {
+ 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 obj/include/bits/alltypes.h
+ just_headers && return 0
+
+ emake
+}
+
+src_install() {
+ local target="install"
+ just_headers && target="install-headers"
+ emake DESTDIR="${D}" ${target}
+ 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}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+ into /
+ dosbin "${T}"/ldconfig
+ into /usr
+ dobin "${FILESDIR}"/getent
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+ 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-20 18:52 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-20 18:52 UTC (permalink / raw
To: gentoo-commits
commit: e37f8c29efb2985083adc34feb62bab4ff3323d3
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 19:01:05 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 19:01:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37f8c29
sys-libs/musl: version 1.1.13 has a serious regression
Package-Manager: portage-2.2.26
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.13.ebuild | 131 ---------------------------------------
2 files changed, 132 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 6b764e3..a4d3803 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1 @@
DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
-DIST musl-1.1.13.tar.gz 894640 SHA256 bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013 SHA512 d5f4a6fdb6a2cdbd7ab1ad5a8d91b1c690b3bd31d9049dfc022067019bba11952e375374eed982a0ddac7347d17f9ff2300178c4d5f27bdd8480933cc6e67802 WHIRLPOOL 4e419cebdb4deef4f0828d2b762783e40b1292048c6ba94ba70c48ef5277a1410fe1724ef242e8cab6db51e167e87496de3a8e7c4c016dcd17eadff8d3b3b7fe
diff --git a/sys-libs/musl/musl-1.1.13.ebuild b/sys-libs/musl/musl-1.1.13.ebuild
deleted file mode 100644
index c983947..0000000
--- a/sys-libs/musl/musl-1.1.13.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-r3
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-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"
-
-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 || die
- $(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
-}
-
-src_prepare() {
- 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 obj/include/bits/alltypes.h
- just_headers && return 0
-
- emake
-}
-
-src_install() {
- local target="install"
- just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target}
- 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}" || die
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
- into /
- dosbin "${T}"/ldconfig
- into /usr
- dobin "${FILESDIR}"/getent
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
- 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-17 4:42 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-17 4:42 UTC (permalink / raw
To: gentoo-commits
commit: 0f41be14aee0960e2ee7fb8b9ab7a64fa5df5f6c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 04:51:38 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 04:51:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f41be14
sys-libs/musl: version 1.1.13 stable on amd64, arm and x86
Package-Manager: portage-2.2.26
sys-libs/musl/musl-1.1.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.13.ebuild b/sys-libs/musl/musl-1.1.13.ebuild
index 85bdc9b..c983947 100644
--- a/sys-libs/musl/musl-1.1.13.ebuild
+++ b/sys-libs/musl/musl-1.1.13.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 arm ~mips ~ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-17 0:51 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-17 0:51 UTC (permalink / raw
To: gentoo-commits
commit: bdca930be2036ed0121074723b8944b91ef875e8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 01:00:21 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 01:00:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdca930b
sys-libs/musl: bring 9999 version up to date with upstream
Package-Manager: portage-2.2.26
sys-libs/musl/musl-9999.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index e480468..85bdc9b 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -32,6 +32,9 @@ IUSE="crosscompile_opts_headers-only"
RDEPEND="!sys-apps/getent"
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -78,7 +81,7 @@ src_configure() {
}
src_compile() {
- emake include/bits/alltypes.h
+ emake obj/include/bits/alltypes.h
just_headers && return 0
emake
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2016-02-17 0:48 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2016-02-17 0:48 UTC (permalink / raw
To: gentoo-commits
commit: f2d6427eaca4248a050a208cb75a947b53c8dd32
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 00:56:29 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 00:58:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d6427e
sys-libs/musl: fix compilation errors with 1.1.13
Package-Manager: portage-2.2.26
sys-libs/musl/musl-1.1.13.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.13.ebuild b/sys-libs/musl/musl-1.1.13.ebuild
index e480468..85bdc9b 100644
--- a/sys-libs/musl/musl-1.1.13.ebuild
+++ b/sys-libs/musl/musl-1.1.13.ebuild
@@ -32,6 +32,9 @@ IUSE="crosscompile_opts_headers-only"
RDEPEND="!sys-apps/getent"
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -78,7 +81,7 @@ src_configure() {
}
src_compile() {
- emake include/bits/alltypes.h
+ emake obj/include/bits/alltypes.h
just_headers && return 0
emake
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-11-29 2:06 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-11-29 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 6d844bdd8b581c94b98e55a1178664a8551a6cdb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 02:13:26 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 02:13:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d844bdd
sys-libs/musl: remove older stable version.
Package-Manager: portage-2.2.20.1
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.11-r1.ebuild | 129 ------------------------------------
2 files changed, 130 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index d896113..a4d3803 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1 @@
-DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb
DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
diff --git a/sys-libs/musl/musl-1.1.11-r1.ebuild b/sys-libs/musl/musl-1.1.11-r1.ebuild
deleted file mode 100644
index 018860e..0000000
--- a/sys-libs/musl/musl-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-codeset.patch
- 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-25 14:52 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-25 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 2545767b8570b69caf621510ee093ede94f06462
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 14:58:39 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 14:58:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2545767b
sys-libs/musl: version 1.1.12 stable on arm and ppc.
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index 657955a..239a045 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-22 11:07 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-22 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 28ed35354e673d185de1169aeda03f62f98fd832
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 11:12:58 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 11:13:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ed3535
sys-libs/musl: version 1.1.12 stable on amd64 and x86
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index 016d210..657955a 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 ~arm ~mips ~ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-21 19:40 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-21 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 300e71f39059f78b8ec70a0bbfcf64efa667a7e4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 19:45:57 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:45:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300e71f3
sys-libs/musl: add `|| die` for touch
Thanks hasufell.
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.12.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index 10a56ce..016d210 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -42,7 +42,7 @@ just_headers() {
musl_endian() {
# XXX: this wont work for bi-endian, but we dont have any
- touch "${T}"/endian.s
+ touch "${T}"/endian.s || die
$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
case $(file "${T}"/endian.o) in
*" MSB "*) echo "";;
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 10a56ce..016d210 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -42,7 +42,7 @@ just_headers() {
musl_endian() {
# XXX: this wont work for bi-endian, but we dont have any
- touch "${T}"/endian.s
+ touch "${T}"/endian.s || die
$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
case $(file "${T}"/endian.o) in
*" MSB "*) echo "";;
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-21 19:37 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-21 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 8b6ef82a98b77330b3d226902fbbd37d21469a85
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 19:43:24 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:43:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6ef82a
sys-libs/musl: switch to git-r3
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.12.ebuild | 2 +-
sys-libs/musl/musl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index 8de636c..10a56ce 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -7,7 +7,7 @@ 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
+ inherit git-r3
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 8de636c..10a56ce 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -7,7 +7,7 @@ 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
+ inherit git-r3
fi
export CBUILD=${CBUILD:-${CHOST}}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-21 19:33 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-21 19:33 UTC (permalink / raw
To: gentoo-commits
commit: c357084ea3f964cfd5822ad6d5d2bf95eac0b837
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 19:38:13 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:40:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c357084e
sys-libs/musl: cleanup wrt `|| die`
Thanks hasufell.
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.12.ebuild | 12 ++++++------
sys-libs/musl/musl-9999.ebuild | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
index f7c9ef0..8de636c 100644
--- a/sys-libs/musl/musl-1.1.12.ebuild
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -78,16 +78,16 @@ src_configure() {
}
src_compile() {
- emake include/bits/alltypes.h || die
+ emake include/bits/alltypes.h
just_headers && return 0
- emake || die
+ emake
}
src_install() {
local target="install"
just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target} || die
+ emake DESTDIR="${D}" ${target}
just_headers && return 0
# musl provides ldd via a sym link to its ld.so
@@ -106,13 +106,13 @@ src_install() {
ppc) arch="powerpc";;
x86) arch="i386";;
esac
- cp "${FILESDIR}"/ldconfig.in "${T}"
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
dosbin "${T}"/ldconfig
into /usr
dobin "${FILESDIR}"/getent
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+ 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 f7c9ef0..8de636c 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -78,16 +78,16 @@ src_configure() {
}
src_compile() {
- emake include/bits/alltypes.h || die
+ emake include/bits/alltypes.h
just_headers && return 0
- emake || die
+ emake
}
src_install() {
local target="install"
just_headers && target="install-headers"
- emake DESTDIR="${D}" ${target} || die
+ emake DESTDIR="${D}" ${target}
just_headers && return 0
# musl provides ldd via a sym link to its ld.so
@@ -106,13 +106,13 @@ src_install() {
ppc) arch="powerpc";;
x86) arch="i386";;
esac
- cp "${FILESDIR}"/ldconfig.in "${T}"
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
into /
dosbin "${T}"/ldconfig
into /usr
dobin "${FILESDIR}"/getent
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
doenvd "${T}"/00musl || die
fi
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-10-21 1:21 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-10-21 1:21 UTC (permalink / raw
To: gentoo-commits
commit: 9b148658557a8bfa75f3408d0ad3ed585710c5e1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 01:27:47 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 01:28:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b148658
sys-libs/musl: version bump to 1.1.12.
Package-Manager: portage-2.2.20.1
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.12.ebuild | 128 +++++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 1b08e70..86e2f73 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1,3 @@
DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158
DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb
+DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild
new file mode 100644
index 0000000..f7c9ef0
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.12.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+src_prepare() {
+ 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-09-08 22:15 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-09-08 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 4271c2ce70566e39993d0d62aadf6446b6c05277
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 22:19:20 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 22:19:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4271c2ce
sys-libs/musl: 1.1.11-r1 stable on amd64, arm, ppc, x86.
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.11-r1.ebuild b/sys-libs/musl/musl-1.1.11-r1.ebuild
index 011baca..018860e 100644
--- a/sys-libs/musl/musl-1.1.11-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.11-r1.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-08-31 3:02 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-08-31 3:02 UTC (permalink / raw
To: gentoo-commits
commit: 1e8c463627933332c03e2e6fcefdbd6a3c0588b1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:06:34 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 03:06:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e8c4636
sys-libs/musl: stable on amd64, arm, ppc and x86.
Package-Manager: portage-2.2.20.1
sys-libs/musl/musl-1.1.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/musl/musl-1.1.11.ebuild b/sys-libs/musl/musl-1.1.11.ebuild
index f7c9ef0..8fe6feb 100644
--- a/sys-libs/musl/musl-1.1.11.ebuild
+++ b/sys-libs/musl/musl-1.1.11.ebuild
@@ -23,7 +23,7 @@ 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"
+ KEYWORDS="-* amd64 arm ~mips ppc x86"
fi
LICENSE="MIT LGPL-2 GPL-2"
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-08-30 14:37 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-08-30 14:37 UTC (permalink / raw
To: gentoo-commits
commit: ab96738da00b829e409c2e857fc27114c5d6c303
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 14:41:04 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 14:41:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab96738d
sys-libs/musl: version bump to 1.1.11
Package-Manager: portage-2.2.20.1
sys-libs/musl/Manifest | 1 +
sys-libs/musl/musl-1.1.11.ebuild | 128 +++++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 4a3c825..1b08e70 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1 +1,2 @@
DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158
+DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb
diff --git a/sys-libs/musl/musl-1.1.11.ebuild b/sys-libs/musl/musl-1.1.11.ebuild
new file mode 100644
index 0000000..f7c9ef0
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.11.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+src_prepare() {
+ 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 related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-08-09 9:23 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-08-09 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 5be178908d0d2714c1c8e44a3259341e4ebbf573
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 09:26:04 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 09:26:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be17890
sys-libs/musl: fix epatch_user. Bug #557042.
Package-Manager: portage-2.2.20
sys-libs/musl/musl-1.1.10-r1.ebuild | 3 +--
sys-libs/musl/musl-9999.ebuild | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-libs/musl/musl-1.1.10-r1.ebuild b/sys-libs/musl/musl-1.1.10-r1.ebuild
index 3357f91..d6830e2 100644
--- a/sys-libs/musl/musl-1.1.10-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.10-r1.ebuild
@@ -58,12 +58,11 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
-
- epatch_user
}
src_prepare() {
epatch "${FILESDIR}"/${P}-uselocale-0-fix.diff
+ epatch_user
}
src_configure() {
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6d1ca35..f7c9ef0 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -58,7 +58,9 @@ pkg_setup() {
*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
esac
fi
+}
+src_prepare() {
epatch_user
}
^ permalink raw reply related [flat|nested] 171+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
@ 2015-08-09 9:18 Anthony G. Basile
0 siblings, 0 replies; 171+ messages in thread
From: Anthony G. Basile @ 2015-08-09 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 2055ff13274bbd9842e887d6d2a47d12923f5c48
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 09:21:58 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 09:21:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2055ff13
sys-libs/musl: remove older stable.
Package-Manager: portage-2.2.20
sys-libs/musl/Manifest | 1 -
sys-libs/musl/musl-1.1.8-r2.ebuild | 104 -------------------------------------
2 files changed, 105 deletions(-)
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 382351b..4a3c825 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1,2 +1 @@
DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158
-DIST musl-1.1.8.tar.gz 904465 SHA256 fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813 SHA512 de2f0b03fd199e2ceb9937686d1092838744dccaddb3916f9baef9cdd2621624fb3c4af2206a3366d12852d84ccc8b0b68350f9d06a9e2bcdbc0309dc05383ff WHIRLPOOL 439059ed2134614cf7ccd3b8b7a8c50c53b7aab4a8114b030a1bd2fdb12c6c57621a7ee139aafcada2500c3b0dea3b1b812d7bae7bca85243867edd520adb891
diff --git a/sys-libs/musl/musl-1.1.8-r2.ebuild b/sys-libs/musl/musl-1.1.8-r2.ebuild
deleted file mode 100644
index 940d1e4..0000000
--- a/sys-libs/musl/musl-1.1.8-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
- 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 related [flat|nested] 171+ messages in thread
end of thread, other threads:[~2024-07-08 3:38 UTC | newest]
Thread overview: 171+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-03 11:18 [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2024-07-08 3:38 Sam James
2024-07-08 3:38 Sam James
2024-07-08 3:38 Sam James
2024-07-08 3:38 Sam James
2024-05-02 7:31 Andreas K. Hüttel
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-04 10:24 Sam James
2024-03-01 7:55 Sam James
2024-01-01 2:20 Sam James
2023-12-30 6:59 Arthur Zamarin
2023-12-30 6:59 Arthur Zamarin
2023-12-30 6:59 Arthur Zamarin
2023-12-30 6:59 Arthur Zamarin
2023-12-30 6:59 Arthur Zamarin
2023-12-30 6:59 Arthur Zamarin
2023-12-28 3:53 Sam James
2023-12-28 3:53 Sam James
2023-12-17 11:45 Sam James
2023-08-22 18:04 Sam James
2023-05-09 11:38 Sam James
2023-05-02 19:11 Sam James
2023-04-03 19:06 Mike Gilbert
2023-04-03 19:06 Mike Gilbert
2023-04-03 19:06 Mike Gilbert
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-02-15 9:56 Sam James
2023-02-05 19:08 James Le Cuirot
2023-01-29 8:45 Sam James
2023-01-15 22:41 Sam James
2022-12-29 19:01 Sam James
2022-11-08 1:30 Sam James
2022-10-17 20:31 Sam James
2022-09-23 1:56 Sam James
2022-09-23 1:56 Sam James
2022-09-19 15:50 Sam James
2022-09-13 23:46 Sam James
2022-09-12 17:18 Sam James
2022-09-11 17:27 Sam James
2022-09-10 11:28 Sam James
2022-08-06 14:57 Jory Pratt
2022-07-18 16:03 Sam James
2022-07-18 16:03 Sam James
2022-06-22 23:12 Sam James
2022-04-23 2:09 Sam James
2022-04-15 16:39 Arthur Zamarin
2022-04-12 7:15 Sam James
2022-04-07 22:38 Sam James
2022-04-07 20:55 Sam James
2022-04-07 20:55 Sam James
2022-02-26 17:32 Andreas K. Hüttel
2022-02-10 4:12 Sam James
2021-12-01 21:57 Anthony G. Basile
2021-11-19 3:05 Sam James
2021-11-18 0:48 Sam James
2021-11-18 0:02 Sam James
2021-11-16 2:59 Sam James
2021-11-15 7:19 Sam James
2021-11-10 3:39 Sam James
2021-11-10 3:32 Sam James
2021-08-16 0:59 Jory Pratt
2021-06-06 9:31 Sergei Trofimovich
2021-04-24 12:37 Sergei Trofimovich
2021-04-03 11:52 Anthony G. Basile
2021-02-16 20:09 Jory Pratt
2021-02-15 0:32 Sam James
2021-02-14 17:09 Jory Pratt
2021-01-21 15:43 Mike Gilbert
2021-01-20 18:02 Mike Gilbert
2021-01-20 9:09 Sergei Trofimovich
2021-01-19 21:56 Anthony G. Basile
2021-01-03 18:58 Fabian Groffen
2020-12-06 21:21 Anthony G. Basile
2020-11-30 14:21 Anthony G. Basile
2020-11-30 0:06 Anthony G. Basile
2020-11-27 20:57 Anthony G. Basile
2020-08-20 13:15 Anthony G. Basile
2020-08-06 14:38 Anthony G. Basile
2020-05-25 9:22 Sergei Trofimovich
2020-05-20 22:12 Jory Pratt
2020-03-03 1:45 Anthony G. Basile
2020-02-26 3:24 Jory Pratt
2020-02-02 13:04 Sergei Trofimovich
2020-01-30 2:06 Anthony G. Basile
2020-01-30 2:06 Anthony G. Basile
2020-01-05 19:56 Anthony G. Basile
2020-01-05 19:23 Anthony G. Basile
2019-11-22 17:17 Anthony G. Basile
2019-11-17 16:58 Anthony G. Basile
2019-11-10 1:30 Anthony G. Basile
2019-10-14 13:57 Jory Pratt
2019-09-08 20:41 Anthony G. Basile
2019-09-07 14:26 Anthony G. Basile
2019-09-03 14:40 Anthony G. Basile
2019-09-03 11:18 Anthony G. Basile
2019-09-03 11:18 Anthony G. Basile
2019-07-18 17:23 Anthony G. Basile
2019-05-12 23:47 Anthony G. Basile
2019-04-28 19:44 Anthony G. Basile
2019-04-14 15:43 Anthony G. Basile
2019-04-10 19:53 Anthony G. Basile
2019-04-06 20:15 Anthony G. Basile
2019-03-31 14:57 Anthony G. Basile
2019-02-02 17:28 Sergei Trofimovich
2019-01-27 16:13 Anthony G. Basile
2019-01-27 15:59 Anthony G. Basile
2019-01-27 12:44 Anthony G. Basile
2019-01-27 12:44 Anthony G. Basile
2018-12-31 18:26 Anthony G. Basile
2018-10-04 21:39 Anthony G. Basile
2018-09-13 18:56 Anthony G. Basile
2018-09-13 2:24 Anthony G. Basile
2018-09-12 21:28 Anthony G. Basile
2018-08-02 23:31 Anthony G. Basile
2018-08-02 23:13 Anthony G. Basile
2018-08-02 23:13 Anthony G. Basile
2018-03-04 0:37 Anthony G. Basile
2018-02-23 16:08 Anthony G. Basile
2018-01-07 19:39 Sergei Trofimovich
2018-01-01 9:59 Anthony G. Basile
2017-12-29 18:22 Sergei Trofimovich
2017-11-27 14:46 Anthony G. Basile
2017-11-27 14:46 Anthony G. Basile
2017-11-12 13:51 Anthony G. Basile
2017-11-02 1:07 Anthony G. Basile
2017-11-02 1:07 Anthony G. Basile
2017-10-31 20:39 Anthony G. Basile
2017-10-31 20:35 Anthony G. Basile
2017-10-20 23:38 Anthony G. Basile
2017-09-06 21:00 Michał Górny
2017-04-23 1:07 Anthony G. Basile
2017-01-08 23:00 Anthony G. Basile
2017-01-01 16:57 Anthony G. Basile
2016-10-23 9:11 Anthony G. Basile
2016-10-20 3:49 Anthony G. Basile
2016-10-20 3:49 Anthony G. Basile
2016-09-24 20:15 Anthony G. Basile
2016-09-24 13:51 Anthony G. Basile
2016-09-20 9:19 Anthony G. Basile
2016-07-06 23:42 Anthony G. Basile
2016-06-05 8:02 Anthony G. Basile
2016-06-05 0:39 Anthony G. Basile
2016-06-05 0:35 Anthony G. Basile
2016-02-22 11:52 Anthony G. Basile
2016-02-22 8:50 Anthony G. Basile
2016-02-20 18:52 Anthony G. Basile
2016-02-17 4:42 Anthony G. Basile
2016-02-17 0:51 Anthony G. Basile
2016-02-17 0:48 Anthony G. Basile
2015-11-29 2:06 Anthony G. Basile
2015-10-25 14:52 Anthony G. Basile
2015-10-22 11:07 Anthony G. Basile
2015-10-21 19:40 Anthony G. Basile
2015-10-21 19:37 Anthony G. Basile
2015-10-21 19:33 Anthony G. Basile
2015-10-21 1:21 Anthony G. Basile
2015-09-08 22:15 Anthony G. Basile
2015-08-31 3:02 Anthony G. Basile
2015-08-30 14:37 Anthony G. Basile
2015-08-09 9:23 Anthony G. Basile
2015-08-09 9:18 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox