Date: Tue, 31 Dec 2013 05:47:06 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185322: emulators/cpmemu: Fix build with clang Message-ID: <20131231054706.cdfc82317b967355cf804aac@yahoo.com> Resent-Message-ID: <201312302110.rBULA4ow098675@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185322
>Category: ports
>Synopsis: emulators/cpmemu: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 30 21:10:04 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/cpmemu/Makefile emulators/cpmemu/Makefile
--- /usr/ports/emulators/cpmemu/Makefile 2013-11-06 22:06:16.000000000 +0900
+++ emulators/cpmemu/Makefile 2013-12-31 00:00:00.000000000 +0900
@@ -18,5 +18,13 @@
ONLY_FOR_ARCHS= i386
-NO_STAGE= yes
-.include <bsd.port.mk>
+USES= compiler
+
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == "clang"
+USE_BINUTILS= yes
+CPPFLAGS+= -no-integrated-as
+.endif
+
+.include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/cpmemu/files/patch-ab emulators/cpmemu/files/patch-ab
--- /usr/ports/emulators/cpmemu/files/patch-ab 2013-11-06 22:06:16.000000000 +0900
+++ emulators/cpmemu/files/patch-ab 2013-12-31 00:00:00.000000000 +0900
@@ -21,14 +21,14 @@
+CC ?= gcc
-CFLAGS = -O2 -pipe -ansi -Wall \
-+CFLAGS += -ansi -Wall \
++CFLAGS += $(CPPFLAGS) -ansi -Wall \
-Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \
-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \
-Wnested-externs -Wwrite-strings \
-DCPMLIBDIR=\"$(CPMLIBDIR)\"
-LDFLAGS = -s
-+LDFLAGS += -s
++#LDFLAGS = -s
OBJS = single.o z80emu.o em.o io.o bios.o \
commands.o running.o main.o disneu.o disz80.o low.o
@@ -44,9 +44,10 @@
install: all
- install -m 511 cpm $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} cpm $(BINDIR)/cpmemu
-+ ${BSD_INSTALL_PROGRAM} format $(BINDIR)/cpmformat
- -mkdir $(CPMLIBDIR)
+- -mkdir $(CPMLIBDIR)
- chmod 755 $(CPMLIBDIR)
- install -m 444 z80-binaries/* $(CPMLIBDIR)
-+ ${BSD_INSTALL_DATA} z80-binaries/* $(CPMLIBDIR)
++ ${BSD_INSTALL_PROGRAM} cpm $(DESTDIR)$(BINDIR)/cpmemu
++ ${BSD_INSTALL_PROGRAM} format $(DESTDIR)$(BINDIR)/cpmformat
++ -mkdir $(DESTDIR)$(CPMLIBDIR)
++ ${BSD_INSTALL_DATA} z80-binaries/* $(DESTDIR)$(CPMLIBDIR)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054706.cdfc82317b967355cf804aac>