Source: simh
Version: 3.8.1-6
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
simh fails to cross build from source, because the upstream Makefile
fuses compiler flags into the CC variable. When dh_auto_build
substitutes CC, those flags get lost and the build fails. Moving the
flags to a separate variabel (usually called CFLAGS) fixes the cross
build. Please consider applying the attached patch.
Helmut
diff -u simh-3.8.1/makefile simh-3.8.1/makefile
--- simh-3.8.1/makefile
+++ simh-3.8.1/makefile
@@ -1,7 +1,8 @@
# Simh makefile for Debian Package
#
OS_CCDEFS = -lrt -D_GNU_SOURCE
-CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
+CC = gcc
+CFLAGS = -std=c99 -O2 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
LIBS = -lm -lrt
USE_NETWORK = 1
@@ -278,120 +279,120 @@
eclipseemu : ${ECLIPSEEMU} ${SIM}
- ${CC} ${ECLIPSEEMU} ${SIM} ${ECLIPSEEMU_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${ECLIPSEEMU} ${SIM} ${ECLIPSEEMU_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp1 : ${PDP1} ${SIM}
- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp4 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp7 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp8 : ${PDP8} ${SIM}
- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp9 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp15 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp10 : ${PDP10} ${SIM}
- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS} ${LIBS}
pdp11 : ${PDP11} ${SIM}
- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS} ${LIBS}
vax : ${VAX} ${SIM}
- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS} ${LIBS}
vax780 : ${VAX780} ${SIM}
- ${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS} ${LIBS}
dgnova : ${NOVA} ${SIM}
- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS} ${LIBS}
h316 : ${H316} ${SIM}
- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS} ${LIBS}
hp2100 : ${HP2100} ${SIM}
- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS} ${LIBS}
i1401 : ${I1401} ${SIM}
- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS} ${LIBS}
i1620 : ${I1620} ${SIM}
- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS} ${LIBS}
i7094 : ${I7094} ${SIM}
- ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS} ${LIBS}
system3 : ${SYSTEM3} ${SIM}
- ${CC} ${SYSTEM3} ${SIM} ${SYSTEM3_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${SYSTEM3} ${SIM} ${SYSTEM3_OPT} -o $@ ${LDFLAGS} ${LIBS}
altair : ${ALTAIR} ${SIM}
- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS} ${LIBS}
altairz80 : ${ALTAIRZ80} ${SIM}
- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS} ${LIBS}
gri909 : ${GRI} ${SIM}
- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS} ${LIBS}
lgp : ${LGP} ${SIM}
- ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS} ${LIBS}
id16 : ${ID16} ${SIM}
- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS} ${LIBS}
id32 : ${ID32} ${SIM}
- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS} ${LIBS}
sds : ${SDS} ${SIM}
- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS} ${LIBS}
+ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS} ${LIBS}
macro1 : ${MACRO1}
- ${CC} ${MACRO1} -o $@
+ ${CC} ${CFLAGS} ${MACRO1} -o $@
macro7 : ${MACRO7}
- ${CC} ${MACRO7} -o $@
+ ${CC} ${CFLAGS} ${MACRO7} -o $@
macro8x : ${MACRO8X}
- ${CC} ${MACRO8X} -o $@
+ ${CC} ${CFLAGS} ${MACRO8X} -o $@
dtos8cvt : ${DTOS8CVT}
- ${CC} ${DTOS8CVT} -o $@
+ ${CC} ${CFLAGS} ${DTOS8CVT} -o $@
gt7cvt : ${GT7CVT}
- ${CC} ${GT7CVT} -o $@
+ ${CC} ${CFLAGS} ${GT7CVT} -o $@
mtcvtv23 : ${MTCVTV23}
- ${CC} ${MTCVTV23} -o $@
+ ${CC} ${CFLAGS} ${MTCVTV23} -o $@
mtcvtfix : ${MTCVTFIX}
- ${CC} ${MTCVTFIX} -o $@
+ ${CC} ${CFLAGS} ${MTCVTFIX} -o $@
mtdump : ${MTDUMP}
- ${CC} ${MTDUMP} -o $@
+ ${CC} ${CFLAGS} ${MTDUMP} -o $@
mmdir : ${MMDIR}
- ${CC} ${MMDIR} -o $@
+ ${CC} ${CFLAGS} ${MMDIR} -o $@
littcvt : ${LITTCVT}
- ${CC} ${LITTCVT} -o $@
+ ${CC} ${CFLAGS} ${LITTCVT} -o $@
mtcvtodd : ${MTCVTODD}
- ${CC} ${MTCVTODD} -o $@
+ ${CC} ${CFLAGS} ${MTCVTODD} -o $@
sfmtcvt : ${SFMTCVT}
- ${CC} ${SFMTCVT} -o $@
+ ${CC} ${CFLAGS} ${SFMTCVT} -o $@
config11 : ${CONFIG11}
- ${CC} ${CONFIG11} -o $@
+ ${CC} ${CFLAGS} ${CONFIG11} -o $@
sdsdump : ${SDSDUMP}
- ${CC} ${SDSDUMP} -o $@
+ ${CC} ${CFLAGS} ${SDSDUMP} -o $@
tp512cvt : ${TP512CVT}
- ${CC} ${TP512CVT} -o $@
+ ${CC} ${CFLAGS} ${TP512CVT} -o $@
