From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAECC138334 for ; Thu, 19 Sep 2019 17:47:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20F6BE088D; Thu, 19 Sep 2019 17:47:36 +0000 (UTC) Received: from cloudsdale.the-delta.net.eu.org (cloudsdale.the-delta.net.eu.org [IPv6:2a01:4f8:1c17:4b6d::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7DD7E088D for ; Thu, 19 Sep 2019 17:47:34 +0000 (UTC) Received: from cloudsdale.the-delta.net.eu.org (localhost [127.0.0.1]) by cloudsdale.the-delta.net.eu.org (OpenSMTPD) with ESMTP id f4c84cc2; Thu, 19 Sep 2019 17:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=hacktivis.me; h=from:to :cc:subject:date:message-id:mime-version :content-transfer-encoding; s=20190711_142157; bh=MBFpAg0Cyxqc9P X/6ORtGPENiSMjjsYeMJQ/jDrrqw4=; b=AfbDkuxtGBGIzPn3KdIZvMd9KDhEcA UyArTOtg7EbqorJib6Yh75foQJFt6VJAmqtv5GQxwbY1XygNH2GoUCIIseM5pAGa 7P6fdyhjXFl+acNBTYIwAqh4IDO1Xaiscq5lsFFlQFjdrOH15w2tMW8WosG8P4D4 kvP9SoaRJ+15bo6k+oyKZvAVw4ZFaDCvzm9LsyaM4EIxSuGdJB/nNFXK8FGQwDGT 6UTfX4AUj5vZo9t6irksIdbi61T8ytrHv+zmx7Hawb6aL5JKjlGpuVUWkL/G3hEX GE1dVint0WKPR6Z7E2wAU91CTM8pfMedPvR8JDKONr+A8S4NjchVSd/BifDV7joV 1qjOyVIo24/EwSHqttVkjPQQKroEgu5y6edfR/Lmdy3RI1lslGO7rWpw7KKB79E0 VN8O1bP1DjlEcqbD+Jk73JXU0AmWnFDwTq+bd1JZFXWdZuMWksRerDP6hvEotHDp 60OSncpCLzLb9f2gi1xhpVaZOLXV5RgNHJa0ReIaTazVMk7eNgNe0/JrGAoyrbz6 jVevcqIFl96Lsu5bHTGmbpd5+ZKdiEp4R7UmfcvtJWJZBZQAG+TPR3fyTQwD5tfS tYryCUOdrOk/CArhHUo4fSvEe8Nj26quuF/vZxX6h8zNXRMjCC1z5HVQ9CjEcAJZ B8Fmu5u8RMO6U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=hacktivis.me; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; q=dns; s=20190711_142157; b=eTWFajM4VEl9nVCFd58bUpRnCWCnzv1AoHW utgITS+IgouyW8VK7pclBCD54WtgJ7x6tPyv8tRAZP9okOFlx09d0zQ7q0SwloGU nHbKoIyL2Uum0V33qoQd4LrSl41vTIUUSKqjR0msuZrzPPZv68MTH8uUC9r5ygE5 9Y0B1jGnHkyXr2mLXottILrtMbbr100yc3VKyu390vTcMomfIY/Q99GpVb5xgneR qpBWEXJzAbdBg8Kbq2Ni3U3lUwWP9G5bHCwRgQj8ZcNr76SaT2lmbriA+BT1vsPP bNIixW4Wsq269X6Xl4MYQhlYGdgZEVoSXJPFi0qOixY5vrTLQ0yMPZzEjGtxxsZP g+vfJ2V7kbjYogtaAc0N0n15mmh8OqSmt8oXcAIt+8gxg3gpPJqron3SOQtDXj6s alSg4LWsVsjHypPeVQBvLI7cKV5UFJnZfJ7c7KctJOxa5d0wNqqJNbNxFQ34XzJ8 ppbM9WLMfNrlARxOmVLuxk8S4nxRmb7qE2Nko8Jt1s2wPuv8hl5n9mVWXtq7ZyhS o3CNedeK/udipfjaQLQqLlns+qyGC6xUUkSrnmafpEg2AqwSLbXn7wRmC593CP5p 2c+hxhUvIjJA9XfpazYFJRmMLTN6AOkVMVhUoJfCA5wEKlxxwp3ABzLQYy5fcpx0 pNg8UeaA= Received: from minion.the-delta.net.eu.org (82-64-66-195.subs.proxad.net [82.64.66.195]) by cloudsdale.the-delta.net.eu.org (OpenSMTPD) with ESMTPS id cfd0f5ba (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 19 Sep 2019 17:47:31 +0000 (UTC) Received: from localhost (NightmareMoon.the-delta.net.eu.org [local]) by NightmareMoon.the-delta.net.eu.org (OpenSMTPD) with ESMTPA id b2adc4f9; Thu, 19 Sep 2019 17:47:27 +0000 (UTC) From: "Haelwenn (lanodan) Monnier" To: gentoo-proxy-maint@lists.gentoo.org Cc: "Haelwenn (lanodan) Monnier" Subject: [gentoo-proxy-maint] [PATCH 1/2] app-shells/mksh: USE=static now uses the system libc Date: Thu, 19 Sep 2019 19:47:24 +0200 Message-Id: <20190919174725.31882-1-contact@hacktivis.me> X-Mailer: git-send-email 2.21.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Proxy Maintainers X-BeenThere: gentoo-proxy-maint@gentoo.org X-BeenThere: gentoo-proxy-maint@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 1da8d8d0-cc6a-4a09-b3ec-26c4a795f0e7 X-Archives-Hash: 45c44115fe4f07dcfd88bd155038791e Which means that glibc needs to be masked as it's static-linking is broken. I considered dietlibc as a replacement to klibc but: - dietlibc is maintained-needed too - it could be a elibc_glibc? in DEPEND but this would probably be a noblah USE flag - it would mean that arches where mksh is believed to work and some of our libc do but not dietlibc or klibc (like alpha with bug #487672) would be prevented from USE=static Closes: https://bugs.gentoo.org/653388 Signed-off-by: Haelwenn (lanodan) Monnier --- app-shells/mksh/mksh-57-r2.ebuild | 49 +++++++++++++++++++++++ app-shells/mksh/mksh-9999.ebuild | 7 +--- profiles/base/package.use.mask | 4 ++ profiles/features/musl/package.use.mask | 3 ++ profiles/features/uclibc/package.use.mask | 3 ++ 5 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 app-shells/mksh/mksh-57-r2.ebuild diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild new file mode 100644 index 00000000000..cb6db11f38c --- /dev/null +++ b/app-shells/mksh/mksh-57-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +if [[ $PV = 9999 ]]; then + inherit cvs + ECVS_SERVER="anoncvs.mirbsd.org:/cvs" + ECVS_MODULE="mksh" + ECVS_USER="_anoncvs" + ECVS_AUTH="ext" + KEYWORDS="" +else + SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="MirBSD Korn Shell" +HOMEPAGE="http://mirbsd.de/mksh" +LICENSE="BSD" +SLOT="0" +IUSE="static test" +DEPEND=" + test? ( + dev-lang/perl + sys-apps/ed + ) +" +S="${WORKDIR}/${PN}" + +src_compile() { + tc-export CC + if use static; then export LDSTATIC="-static"; fi + export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" + sh Build.sh -r || die +} + +src_install() { + into / + dobin mksh + doman mksh.1 + dodoc dot.mkshrc +} + +src_test() { + ./test.sh -v || die +} diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index 3aa638fe245..cb6db11f38c 100644 --- a/app-shells/mksh/mksh-9999.ebuild +++ b/app-shells/mksh/mksh-9999.ebuild @@ -14,7 +14,7 @@ if [[ $PV = 9999 ]]; then KEYWORDS="" else SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" - KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="MirBSD Korn Shell" @@ -22,9 +22,7 @@ HOMEPAGE="http://mirbsd.de/mksh" LICENSE="BSD" SLOT="0" IUSE="static test" -RDEPEND="static? ( dev-libs/klibc )" DEPEND=" - ${RDEPEND} test? ( dev-lang/perl sys-apps/ed @@ -34,8 +32,7 @@ S="${WORKDIR}/${PN}" src_compile() { tc-export CC - # we want to build static with klibc - if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi + if use static; then export LDSTATIC="-static"; fi export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" sh Build.sh -r || die } diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 34da891f5c1..b46b9e1acc3 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,6 +7,10 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Haelwenn (lanodan) Monnier (2019-09-19) +# broken static-linking in glibc and maybe others +>app-shells/mksh-57-r1 static + # Craig Andrews (2019-09-12) # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support # see https://github.com/openssl/openssl/pull/8797 diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index 28e05a4e490..42fe7d31b2c 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -16,3 +16,6 @@ sys-fs/e2fsprogs nls # as a fail-only stub in musl. breaks horribly if enabled. # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated) app-shells/bash mem-scramble + +# static linking works with musl +app-shells/mksh -static diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask index eb7b5dc0216..b00ae69a84a 100644 --- a/profiles/features/uclibc/package.use.mask +++ b/profiles/features/uclibc/package.use.mask @@ -22,3 +22,6 @@ dev-util/geany-plugins gtkspell # 'append-libs', but xfsdump's build system doesn't honor $LIBS. # So this is the best way for now. See 570548. sys-fs/xfsdump nls + +# static linking works with uClibc +app-shells/mksh -static -- 2.21.0