From ee41403af23b71a9cf084dc1434e281fecc2163a Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 18 May 2020 22:39:49 -0400 Subject: [PATCH] add -fno-common build to travis --- .travis.yml | 2 +- sys/unix/hints/linux-travis | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 sys/unix/hints/linux-travis diff --git a/.travis.yml b/.travis.yml index 3baeee2c1..cb7ee35b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ matrix: include: - name: linux-xenial-gcc os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux-travis LUA_VERSION=5.3.5 compiler: gcc script: - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ diff --git a/sys/unix/hints/linux-travis b/sys/unix/hints/linux-travis new file mode 100644 index 000000000..fbd35e453 --- /dev/null +++ b/sys/unix/hints/linux-travis @@ -0,0 +1,57 @@ +# +# NetHack 3.6 linux $NHDT-Date: 1432512814 2015/05/25 00:13:34 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ +# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007. +# NetHack may be freely redistributed. See license for details. +# +#-PRE +# Linux hints file +# This hints file provides a single-user tty build for Linux, specifically +# for Ubuntu dapper. + + +#PREFIX=/usr +PREFIX=$(wildcard ~)/nh/install +HACKDIR=$(PREFIX)/games/lib/$(GAME)dir +SHELLDIR = $(PREFIX)/games +INSTDIR=$(HACKDIR) +VARDIR = $(HACKDIR) + + + +POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf; + +CFLAGS=-g -O -I../include -DNOTPARMDECL -fno-common +CFLAGS+=-DDLB +CFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" +CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE +CFLAGS+=-DTIMED_DELAY +CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" +CFLAGS+=-DDUMPLOG +CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE +CFLAGS+=-DCURSES_GRAPHICS +#CFLAGS+=-DEXTRA_SANITY_CHECKS +#CFLAGS+=-DEDIT_GETLIN +#CFLAGS+=-DSCORE_ON_BOTL +#CFLAGS+=-DMSGHANDLER +#CFLAGS+=-DTTY_TILES_ESCCODES + +LINK=$(CC) +# Only needed for GLIBC stack trace: +LFLAGS=-rdynamic + +WINSRC = $(WINTTYSRC) $(WINCURSESSRC) +WINOBJ = $(WINTTYOBJ) $(WINCURSESOBJ) +WINLIB = $(WINTTYLIB) $(WINCURSESLIB) + +# if TTY_TILES_ESCCODES +#WINSRC += tile.c +#WINOBJ += tile.o + +WINTTYLIB=-lncurses -ltinfo + +CHOWN=true +CHGRP=true + +VARDIRPERM = 0755 +VARFILEPERM = 0600 +GAMEPERM = 0755