On 2022 Nov 22 (Tue) at 22:32:06 +0100 (+0100), Christian Weisgerber wrote:
:Theo Buehler:
:
:> These three imake ports were broken by the makedepend 1.0.7 update:
:>
:> > http://build-failures.rhaalovely.net/aarch64/2022-11-14/astro/xephem.log
:> >
http://build-failures.rhaalovely.net/aarch64/2022-11-14/productivity/xinvest.log
:> >
http://build-failures.rhaalovely.net/aarch64/2022-11-14/productivity/xquote.log
:
:Specifically, this upstream commit:
:https://gitlab.freedesktop.org/xorg/util/makedepend/-/commit/3dc64b0b0a7d4e14ccea6b9d1d11bf871c47a7e0
:
:If you compare makedepend's output before and after, some header
:files are now listed several times, growing the output and overflowing
:the internal MAXFILES limit (which is just an arbitrary internal
:array size and not a system resource). So I think that change is
:buggy.
:
I see someone else has already filed a report upstream, so hopefully
that gets fixed by the next release.
:However, as far as the OpenBSD ports tree is concerned, the actual
:issue should be this:
:
:> Of note: amd64 uses gccmakedep instead of makedepend for some reason I
:> have not tried to track down.
:
:It's our imake configuration. This has never been updated, so new
:architectures like aarch64 or riscv64 fall back to a catch all.
:Configurations for older archs like amd64 and sparc64 include a
:section for building an X11 server, which includes <xorg.cf>, which
:happens to set UseGccMakeDepend.
:
:So I think the correct fix is to unify our imake configuration and
:simply use gccmakedep(1) everywhere.
:
:OK?
:
OK
:Index: Makefile
:===================================================================
:RCS file: /cvs/ports/devel/imake-cf/Makefile,v
:retrieving revision 1.16
:diff -u -p -r1.16 Makefile
:--- Makefile 17 Nov 2022 09:12:22 -0000 1.16
:+++ Makefile 22 Nov 2022 21:13:20 -0000
:@@ -4,6 +4,7 @@ CATEGORIES = devel x11
: V = 1.0.7
: DISTNAME = xorg-cf-files-${V}
: PKGNAME = imake-cf-${V}
:+REVISION = 0
: MASTER_SITES = ${MASTER_SITE_XORG:=util/}
:
: PERMIT_PACKAGE = Yes
:Index: patches/patch-OpenBSD_cf
:===================================================================
:RCS file: /cvs/ports/devel/imake-cf/patches/patch-OpenBSD_cf,v
:retrieving revision 1.9
:diff -u -p -r1.9 patch-OpenBSD_cf
:--- patches/patch-OpenBSD_cf 11 Mar 2022 18:50:12 -0000 1.9
:+++ patches/patch-OpenBSD_cf 22 Nov 2022 21:13:20 -0000
:@@ -33,7 +33,15 @@ Index: OpenBSD.cf
: #define BuildHtmlManPages NO
:
: #endif
:-@@ -172,6 +174,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
:+@@ -150,6 +152,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
:+ #define GccUsesGas YES
:+ #define UseGas YES
:+ #define GnuCpp YES
:++#define UseGccMakeDepend YES
:+
:+ #define UseGnuMalloc NO
:+
:+@@ -172,6 +175,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
: #ifndef CcCmd
: #define CcCmd cc
: #endif
:@@ -43,7 +51,7 @@ Index: OpenBSD.cf
: #ifndef AsCmd
: #define AsCmd cc -c -x assembler
: #endif
:-@@ -244,9 +249,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
:+@@ -244,9 +250,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
: /*
: * Documentation formatting
: */
:@@ -69,7 +77,7 @@ Index: OpenBSD.cf
: #define HasGroff YES
:
: #ifndef HasCookieMaker
:-@@ -262,77 +280,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
:+@@ -262,77 +281,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
: */
: #define ManSuffix 1
: #define FileManSuffix 5
:@@ -153,7 +161,7 @@ Index: OpenBSD.cf
: done
:
: #define InstallManPageAliases(file,destdir,aliases) @@\
:-@@ -436,8 +392,6 @@ install:: fonts.alias
@@\
:+@@ -436,8 +393,6 @@ install:: fonts.alias
@@\
: #ifdef AMD64Architecture
:
: # define HasWeakSymbols YES
:@@ -162,7 +170,7 @@ Index: OpenBSD.cf
:
: # define XorgServer YES
:
:-@@ -666,51 +620,26 @@ install:: fonts.alias
@@\
:+@@ -666,51 +621,26 @@ install:: fonts.alias
@@\
:
:
: /*
:--
:Christian "naddy" Weisgerber [email protected]
:
