From ae17690cbbee7ad11ba9eabfb126316a7fffa538 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Dec 2022 07:15:03 +0000 Subject: [PATCH] sys-devel/bc: Sync with Gentoo It's from Gentoo commit 5d625775a8d03535e7eea28b56eff54f7a63ebb5. --- .../sys-devel/bc/bc-1.07.1-r4.ebuild | 2 +- .../sys-devel/bc/bc-1.07.1-r5.ebuild | 2 +- .../sys-devel/bc/bc-1.07.1-r6.ebuild | 84 +++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild index 82f798fc4f..2ac2c73b3d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild @@ -23,7 +23,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex - virtual/yacc" + app-alternatives/yacc" PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch ) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r5.ebuild index 24a7526442..78eefebc16 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r5.ebuild @@ -23,7 +23,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex - virtual/yacc" + app-alternatives/yacc" PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch ) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild new file mode 100644 index 0000000000..175d05638d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Handy console-based calculator utility" +HOMEPAGE="https://www.gnu.org/software/bc/bc.html" +SRC_URI="mirror://gnu/bc/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="libedit readline static" + +RDEPEND=" + !readline? ( libedit? ( dev-libs/libedit:= ) ) + readline? ( + sys-libs/readline:= + sys-libs/ncurses:= + )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/flex + app-alternatives/yacc" +PDEPEND="app-alternatives/bc" + +PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch ) + +src_prepare() { + default + + # Avoid bad build tool usage when cross-compiling. Bug #627126 + tc-is-cross-compiler && eapply "${FILESDIR}"/${PN}-1.07.1-use-system-bc.patch +} + +src_configure() { + local myconf=( + $(use_with readline) + --program-suffix=-reference + ) + + if use readline ; then + myconf+=( --without-libedit ) + else + myconf+=( $(use_with libedit) ) + fi + + use static && append-ldflags -static + + # The libedit code isn't compatible currently. #830101 + use libedit && append-flags -fcommon + + # AC_SYS_LARGEFILE in configure.ac would handle this, but we don't patch + # autotools otherwise currently. This change has been sent upstream, but + # who knows when they'll make another release. + append-lfs-flags + + # configure dies with other lexes: + # "configure: error: readline works only with flex." + export LEX=flex + + econf "${myconf[@]}" + + # Do not regen docs -- configure produces a small fragment that includes + # the version info which causes all pages to regen (newer file). Bug #554774 + touch -r doc doc/* || die +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +pkg_postinst() { + # ensure to preserve the symlinks before app-alternatives/bc + # is installed + local x + for x in bc dc ; do + if [[ ! -h ${EROOT}/usr/bin/${x} ]] ; then + ln -s "${x}-reference" "${EROOT}/usr/bin/${x}" || die + fi + done +}