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 90F58138334 for ; Mon, 8 Jul 2019 23:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8074AE087F; Mon, 8 Jul 2019 23:36:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 63CF4E087F for ; Mon, 8 Jul 2019 23:36:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5CA9347449 for ; Mon, 8 Jul 2019 23:36:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61415603 for ; Mon, 8 Jul 2019 23:36:37 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1562628984.a2cc45b4f4161260a9a5e956c52b3cd4ae889c92.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a2cc45b4f4161260a9a5e956c52b3cd4ae889c92 X-VCS-Branch: master Date: Mon, 8 Jul 2019 23:36:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32e80c95-6b32-4446-bece-fdf91c374f7c X-Archives-Hash: 8fa9f981b0f45d488765481cc7341ada commit: a2cc45b4f4161260a9a5e956c52b3cd4ae889c92 Author: Mike Gilbert gentoo org> AuthorDate: Mon Jul 8 18:25:11 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jul 8 23:36:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cc45b4 sys-boot/grub: drop 'static' use flag Closes: https://bugs.gentoo.org/566632 Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/grub/grub-9999.ebuild | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 5970936ad66..b169b758922 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs" +IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" @@ -92,7 +92,7 @@ BDEPEND=" ) truetype? ( virtual/pkgconfig ) " -COMMON_DEPEND=" +DEPEND=" app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= sdl? ( media-libs/libsdl ) @@ -105,18 +105,7 @@ COMMON_DEPEND=" grub_platforms_xen? ( app-emulation/xen-tools:= ) grub_platforms_xen-32? ( app-emulation/xen-tools:= ) " -DEPEND="${COMMON_DEPEND} - static? ( - app-arch/xz-utils[static-libs(+)] - truetype? ( - app-arch/bzip2[static-libs(+)] - media-libs/freetype[static-libs(+)] - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) - ) -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) @@ -245,8 +234,6 @@ src_configure() { export HOST_LDFLAGS=${LDFLAGS} unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - use static && HOST_LDFLAGS+=" -static" - tc-ld-disable-gold #439082 #466536 #526348 export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" unset LDFLAGS