diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2014-01-19 13:45:39 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2014-01-19 13:45:39 +0000 |
| commit | c8f0bf4576b81fd6cef217b2e9c837eb66b5e181 (patch) | |
| tree | ac869eb4110869e67a5cc1d5a748c243f76df3d9 /emulators/cpmemu | |
| parent | 088cc466d05e9f9b39ac77f783973f86ec1712a1 (diff) | |
| download | ports-c8f0bf4576b81fd6cef217b2e9c837eb66b5e181.tar.gz ports-c8f0bf4576b81fd6cef217b2e9c837eb66b5e181.zip | |
- Fix build with clang
PR: 185322
Submitted by: ports fury
Notes
Notes:
svn path=/head/; revision=340290
Diffstat (limited to 'emulators/cpmemu')
| -rw-r--r-- | emulators/cpmemu/Makefile | 12 | ||||
| -rw-r--r-- | emulators/cpmemu/files/patch-ab | 13 |
2 files changed, 17 insertions, 8 deletions
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile index 30546a9b12d2..e8ae89298a9d 100644 --- a/emulators/cpmemu/Makefile +++ b/emulators/cpmemu/Makefile @@ -18,5 +18,13 @@ COMMENT= Cpm emulator 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 --git a/emulators/cpmemu/files/patch-ab b/emulators/cpmemu/files/patch-ab index 59c238229f1b..c7efc6fabcd8 100644 --- a/emulators/cpmemu/files/patch-ab +++ b/emulators/cpmemu/files/patch-ab @@ -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) |