Package: simh Version: 3.8.1-3 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpUx5Zin In Ubuntu, the attached patch was applied to achieve the following: * makefile: Add ${LIBS} resolving FTBFS when --as-needed is used. - (LP: #811501) Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-5-generic (SMP w/2 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -u simh-3.8.1/makefile simh-3.8.1/makefile --- simh-3.8.1/makefile +++ simh-3.8.1/makefile @@ -1,12 +1,14 @@ # Simh makefile for Debian Package # -OS_CCDEFS = -D_GNU_SOURCE -CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm -lrt $(OS_CCDEFS) -I . +OS_CCDEFS = -lrt -D_GNU_SOURCE +CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I . +LIBS=-lm -lrt ifeq ($(USE_NETWORK),) else # NETWORK_OPT = -DUSE_NETWORK -isystem /usr/include /usr/lib/libpcap.a -NETWORK_OPT = -DUSE_NETWORK -isystem /usr/include -lpcap +NETWORK_OPT = -DUSE_NETWORK +LIBS+=-lpcap endif # @@ -260,76 +262,76 @@ eclipseemu : ${ECLIPSEEMU} ${SIM} - ${CC} ${ECLIPSEEMU} ${SIM} ${ECLIPSEEMU_OPT} -o $@ ${LDFLAGS} + ${CC} ${ECLIPSEEMU} ${SIM} ${ECLIPSEEMU_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp1 : ${PDP1} ${SIM} - ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp4 : ${PDP18B} ${SIM} - ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp7 : ${PDP18B} ${SIM} - ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp8 : ${PDP8} ${SIM} - ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp9 : ${PDP18B} ${SIM} - ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp15 : ${PDP18B} ${SIM} - ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp10 : ${PDP10} ${SIM} - ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS} ${LIBS} pdp11 : ${PDP11} ${SIM} - ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS} + ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS} ${LIBS} vax : ${VAX} ${SIM} - ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS} + ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS} ${LIBS} dgnova : ${NOVA} ${SIM} - ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS} + ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS} ${LIBS} h316 : ${H316} ${SIM} - ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS} + ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS} ${LIBS} hp2100 : ${HP2100} ${SIM} - ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS} + ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS} ${LIBS} i1401 : ${I1401} ${SIM} - ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS} + ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS} ${LIBS} i1620 : ${I1620} ${SIM} - ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS} + ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS} ${LIBS} i7094 : ${I7094} ${SIM} - ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS} + ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS} ${LIBS} system3 : ${SYSTEM3} ${SIM} - ${CC} ${SYSTEM3} ${SIM} ${SYSTEM3_OPT} -o $@ ${LDFLAGS} + ${CC} ${SYSTEM3} ${SIM} ${SYSTEM3_OPT} -o $@ ${LDFLAGS} ${LIBS} altair : ${ALTAIR} ${SIM} - ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS} + ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS} ${LIBS} altairz80 : ${ALTAIRZ80} ${SIM} - ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS} + ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS} ${LIBS} gri909 : ${GRI} ${SIM} - ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS} + ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS} ${LIBS} lgp : ${LGP} ${SIM} - ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS} + ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS} ${LIBS} id16 : ${ID16} ${SIM} - ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS} + ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS} ${LIBS} id32 : ${ID32} ${SIM} - ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS} + ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS} ${LIBS} sds : ${SDS} ${SIM} - ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS} + ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS} ${LIBS} macro1 : ${MACRO1} ${CC} ${MACRO1} -o $@