nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Use local md4 implementation instead of libcrypto for linux.

Browse Source 
NB: "make depend" needs to be rerun
This commit is contained in:
nhkeni
2024-02-23 17:08:05 -05:00
parent 353838c1a6 61f4d972bb
commit eadebf0132
5 changed files with 315 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys/unix/Makefile.src
View File

@@ -501,7 +501,7 @@ HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \
lock.c mail.c makemon.c mcastu.c mdlib.c mhitm.c \
mhitu.c minion.c mklev.c mkmap.c mkmaze.c mkobj.c mkroom.c mon.c \
mondata.c monmove.c monst.c mplayer.c mthrowu.c muse.c music.c \
nhlua.c nhlsel.c nhlobj.c o_init.c objects.c objnam.c \
nhlua.c nhlsel.c nhlobj.c nhmd4.c o_init.c objects.c objnam.c \
options.c pager.c pickup.c pline.c polyself.c potion.c pray.c \
priest.c quest.c questpgr.c read.c rect.c region.c restore.c \
rip.c rnd.c role.c rumors.c save.c sfstruct.c \
@@ -550,7 +550,7 @@ HACKINCL = align.h artifact.h artilist.h attrib.h botl.h \
display.h dlb.h dungeon.h engrave.h extern.h flag.h fnamesiz.h \
func_tab.h global.h warnings.h hack.h lint.h mextra.h mfndpos.h \
micro.h mkroom.h monattk.h mondata.h monflag.h monst.h monsters.h \
obj.h objects.h objclass.h optlist.h patchlevel.h pcconf.h \
nhmd4.h obj.h objects.h objclass.h optlist.h patchlevel.h pcconf.h \
permonst.h prop.h rect.h region.h sym.h defsym.h rm.h sp_lev.h \
spell.h sndprocs.h seffects.h sys.h tcap.h timeout.h \
tradstdc.h trap.h unixconf.h vision.h vmsconf.h wintty.h wincurs.h \
@@ -586,7 +586,8 @@ HOBJ = $(TARGETPFX)allmain.o $(TARGETPFX)alloc.o \
$(TARGETPFX)mondata.o $(TARGETPFX)monmove.o $(TARGETPFX)monst.o \
$(TARGETPFX)mplayer.o $(TARGETPFX)mthrowu.o $(TARGETPFX)muse.o \
$(TARGETPFX)music.o $(TARGETPFX)nhlua.o $(TARGETPFX)nhlsel.o \
$(TARGETPFX)nhlobj.o $(TARGETPFX)objects.o $(TARGETPFX)o_init.o \
$(TARGETPFX)nhlobj.o $(TARGETPFX)nhmd4.o \
$(TARGETPFX)objects.o $(TARGETPFX)o_init.o \
$(TARGETPFX)objnam.o $(TARGETPFX)options.o $(TARGETPFX)pager.o \
$(TARGETPFX)pickup.o $(TARGETPFX)pline.o $(TARGETPFX)polyself.o \
$(TARGETPFX)potion.o $(TARGETPFX)pray.o $(TARGETPFX)priest.o \

31
sys/unix/hints/linux.370
View File

@@ -110,30 +110,6 @@ endif #HAVE_NCURSESW
endif #MAKEFILE_SRC
endif #USE_CURSESLIB
# autodetect missing openssl header needed for CRASHREPORT
# Note: makedefs isn't ready if we're cross-compiling.
# Also note: mdgrep.h _really_ needs to be up-to-date to
# get through this correctly if makedefs does exist.
CRTEST=$(shell ls ../util/makedefs 2>/dev/null | wc -l)
ifeq "$(CRTEST)" "0"
# If makedefs doesn't exist, force the tests to fail
CRI=9
CRC=9
else
# If makedefs does exist, see if we can handle CRASHREPORT
CRI=$(shell ls /usr/include/openssl/md4.h 2>/dev/null | wc -l )
CRC=$(shell (../util/makedefs --grep-defined CROSSCOMPILE && echo 1 ) || echo 0)
endif
ifeq "$(CRI)$(CRC)" "10"
# If we can handle CRASHREPORT, see if it's been requested
AUTOLIBS=$(shell (../util/makedefs --grep-defined CRASHREPORT && echo "-lcrypto" ) || true )
else
# Otherwise force it off regardless of config.h
NHCFLAGS+=-DNOCRASHREPORT
endif
# NetHack sources control
NHCFLAGS+=-DDLB
NHCFLAGS+=-DHACKDIR=\"$(HACKDIR)\"
@@ -351,13 +327,6 @@ endif #?WANT_SOURCE_INSTALL
INSTDIR=$(HACKDIR)
VARDIR = $(HACKDIR)
#======= XXX can this go away?
#POSTINSTALL+= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; \
# $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; \
# $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; \
# chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
#>>>>>>> keni-wincw2
ifneq "$(CCISCLANG)" ""
# gdb may not be installed if clang is chosen compiler so the game
# won't start in that case due to a sysconf error. Comment out