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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9ABA15808B for ; Wed, 9 Mar 2022 14:48:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1824E07D8; Wed, 9 Mar 2022 14:47:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1322E07D8 for ; Wed, 9 Mar 2022 14:47:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5C08342FC5 for ; Wed, 9 Mar 2022 14:47:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2785C30C for ; Wed, 9 Mar 2022 14:47:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1646837267.e441c9b10698c0eada30d02dc0353a18cd4bfaa1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/files/, app-misc/fdutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/fdutils/fdutils-5.6_p2.ebuild app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch X-VCS-Directories: app-misc/fdutils/ app-misc/fdutils/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e441c9b10698c0eada30d02dc0353a18cd4bfaa1 X-VCS-Branch: master Date: Wed, 9 Mar 2022 14:47:57 +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: 7678bd20-8175-410d-9e00-9b7013cf629b X-Archives-Hash: e1a1f3f1cc7542e2001d04961a226257 commit: e441c9b10698c0eada30d02dc0353a18cd4bfaa1 Author: Sam James gentoo org> AuthorDate: Wed Mar 9 14:45:22 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 9 14:47:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e441c9b1 app-misc/fdutils: fix docs patch We want to detect / respect CC_FOR_BUILD. Signed-off-by: Sam James gentoo.org> app-misc/fdutils/fdutils-5.6_p2.ebuild | 8 +++++ .../fdutils/files/fdutils-5.6_p2-docs-build.patch | 37 +++++++--------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild b/app-misc/fdutils/fdutils-5.6_p2.ebuild index 4f40a982f956..4f48b92305df 100644 --- a/app-misc/fdutils/fdutils-5.6_p2.ebuild +++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild @@ -5,6 +5,8 @@ EAPI=8 MY_P=${PN}_5.6 +inherit autotools + DESCRIPTION="Utilities for configuring and debugging the Linux floppy driver" HOMEPAGE="https://fdutils.linux.lu" SRC_URI=" @@ -23,6 +25,7 @@ DEPEND="${RDEPEND} " BDEPEND=" sys-apps/texinfo + sys-devel/autoconf-archive doc? ( virtual/texi2dvi ) " @@ -37,10 +40,15 @@ src_prepare() { "${FILESDIR}"/fdutils-5.6_p2-parallel.patch "${FILESDIR}"/fdutils-5.6_p2-docs-build.patch ) + default + + eautoreconf } src_configure() { + export CC_FOR_BUILD="$(tc-getBUILD_CC)" + econf --enable-fdmount-floppy-only } diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch index bca3d58b5ed7..5f0bfccd499c 100644 --- a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch +++ b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch @@ -1,28 +1,13 @@ -From 855e7727c06d6e61d0b1e3e34629de2cf0142a91 Mon Sep 17 00:00:00 2001 -From: Thomas Bracht Laumann Jespersen -Date: Wed, 2 Mar 2022 22:24:30 +0100 -Subject: [PATCH] doc: Replace CC_FOR_BUILD and EXEEXT_FOR_BUILD for building - docs - ---- - doc/Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/Makefile.in b/doc/Makefile.in -index d94736f..d565359 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -37,8 +37,8 @@ INSTALL_INFO= @INSTALL_INFO@ - CC = @CC@ - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ --CC_FOR_BUILD = @CC_FOR_BUILD@ --EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ -+CC_FOR_BUILD = $(CC) -+EXEEXT_FOR_BUILD = +Use modern autoconf-archive macro to ensure @CC_FOR_BUILD@ and such gets +replaced in Makefiles. +--- a/configure.in ++++ b/configure.in +@@ -9,7 +9,7 @@ AC_PROG_CC + AC_PROG_GCC_TRADITIONAL + AC_PROG_INSTALL + AC_PROG_LN_S +-AX_CC_FOR_BUILD ++AX_PROG_CC_FOR_BUILD - all: info dvi + AC_PATH_PROG(INSTALL_INFO, install-info, "") --- -2.34.1 -