Add CROSSCOMPILE to mdgrep, then use it to stop CRASHREPORT when cross-compiling

This commit is contained in:
nhkeni
2024-02-15 19:37:43 -05:00
parent e378b782fc
commit c02220499b
3 changed files with 11 additions and 5 deletions
+3 -2
View File
@@ -111,8 +111,9 @@ endif #MAKEFILE_SRC
endif #USE_CURSESLIB endif #USE_CURSESLIB
# autodetect missing openssl header needed for CRASHREPORT # autodetect missing openssl header needed for CRASHREPORT
CROK=$(shell ls /usr/include/openssl/md4.h 2>/dev/null | wc -l ) CRI=$(shell ls /usr/include/openssl/md4.h 2>/dev/null | wc -l )
ifeq "$(CROK)" "1" 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 ) AUTOLIBS=$(shell (../util/makedefs --grep-defined CRASHREPORT && echo "-lcrypto" ) || true )
else else
NHCFLAGS+=-DNOCRASHREPORT NHCFLAGS+=-DNOCRASHREPORT
+7 -2
View File
@@ -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 * Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008
* NetHack may be freely redistributed. See license for details. * 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. * DO NOT EDIT! Your changes will be lost.
*/ */
static struct grep_var grep_vars[]={ static struct grep_var grep_vars[]={
@@ -54,6 +54,11 @@ static struct grep_var grep_vars[]={
#else #else
{"CRASHREPORT", 0}, {"CRASHREPORT", 0},
#endif #endif
#if defined(CROSSCOMPILE)
{"CROSSCOMPILE", 1},
#else
{"CROSSCOMPILE", 0},
#endif
#if defined(DLB) #if defined(DLB)
{"DLB", 1}, {"DLB", 1},
#else #else
+1 -1
View File
@@ -27,7 +27,7 @@
/; /;
# Miscellaneous # Miscellaneous
@misc = qw/BETA/; @misc = qw/BETA CROSSCOMPILE/;
# Meta # Meta
@meta = qw/ALLDOCS/; # convention: use --grep-define ALLDOCS to notate @meta = qw/ALLDOCS/; # convention: use --grep-define ALLDOCS to notate