From e441c9b10698c0eada30d02dc0353a18cd4bfaa1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 9 Mar 2022 14:45:22 +0000 Subject: app-misc/fdutils: fix docs patch We want to detect / respect CC_FOR_BUILD. Signed-off-by: Sam James --- 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(-) (limited to 'app-misc') 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 - -- cgit v1.2.3-65-gdbad