From c02220499b92a0bd6313acf9d31c77b0ab33b787 Mon Sep 17 00:00:00 2001 From: nhkeni Date: Thu, 15 Feb 2024 19:37:43 -0500 Subject: [PATCH] Add CROSSCOMPILE to mdgrep, then use it to stop CRASHREPORT when cross-compiling --- sys/unix/hints/linux.370 | 5 +++-- util/mdgrep.h | 9 +++++++-- util/mdgrep.pl | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370 index 8affd9df1..35a2cc9c8 100755 --- a/sys/unix/hints/linux.370 +++ b/sys/unix/hints/linux.370 @@ -111,8 +111,9 @@ endif #MAKEFILE_SRC endif #USE_CURSESLIB # autodetect missing openssl header needed for CRASHREPORT -CROK=$(shell ls /usr/include/openssl/md4.h 2>/dev/null | wc -l ) -ifeq "$(CROK)" "1" +CRI=$(shell ls /usr/include/openssl/md4.h 2>/dev/null | wc -l ) +CRC=$(shell (../util/makedefs --grep-defined CROSSCOMPILE && echo 1 ) || echo 0) +ifeq "$(CRI)$(CRC)" "10" AUTOLIBS=$(shell (../util/makedefs --grep-defined CRASHREPORT && echo "-lcrypto" ) || true ) else NHCFLAGS+=-DNOCRASHREPORT diff --git a/util/mdgrep.h b/util/mdgrep.h index ce0433ec9..deb917e11 100644 --- a/util/mdgrep.h +++ b/util/mdgrep.h @@ -1,9 +1,9 @@ /* - * NetHack 3.7 mdgrep.h $NHDT-Date: 1693083343 2023/08/26 20:55:43 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.18 $ + * NetHack 3.7 mdgrep.h $NHDT-Date: 1693083351 2023/08/26 20:55:51 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.24 $ * Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008 * NetHack may be freely redistributed. See license for details. * - * This file generated by mdgrep.pl version 1.23. + * This file generated by mdgrep.pl version 1.24. * DO NOT EDIT! Your changes will be lost. */ static struct grep_var grep_vars[]={ @@ -54,6 +54,11 @@ static struct grep_var grep_vars[]={ #else {"CRASHREPORT", 0}, #endif +#if defined(CROSSCOMPILE) + {"CROSSCOMPILE", 1}, +#else + {"CROSSCOMPILE", 0}, +#endif #if defined(DLB) {"DLB", 1}, #else diff --git a/util/mdgrep.pl b/util/mdgrep.pl index d2f022615..3e71300c9 100644 --- a/util/mdgrep.pl +++ b/util/mdgrep.pl @@ -27,7 +27,7 @@ /; # Miscellaneous -@misc = qw/BETA/; +@misc = qw/BETA CROSSCOMPILE/; # Meta @meta = qw/ALLDOCS/; # convention: use --grep-define ALLDOCS to notate