ports/185322: commit references a PR

dfilter service dfilter at FreeBSD.ORG
Sat Jan 25 13:10:04 UTC 2014


The following reply was made to PR ports/185322; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/185322: commit references a PR
Date: Sat, 25 Jan 2014 13:03:22 +0000 (UTC)

 Author: miwi
 Date: Sat Jan 25 13:03:14 2014
 New Revision: 341024
 URL: http://svnweb.freebsd.org/changeset/ports/341024
 QAT: https://qat.redports.org/buildarchive/r341024/
 
 Log:
   MFH: r340290
   
   - Fix build with clang
   
   PR:		185322
   Submitted by:	ports fury
 
 Modified:
   branches/2014Q1/emulators/cpmemu/Makefile   (contents, props changed)
   branches/2014Q1/emulators/cpmemu/files/patch-ab   (contents, props changed)
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/emulators/cpmemu/Makefile
 ==============================================================================
 --- branches/2014Q1/emulators/cpmemu/Makefile	Sat Jan 25 13:02:05 2014	(r341023)
 +++ branches/2014Q1/emulators/cpmemu/Makefile	Sat Jan 25 13:03:14 2014	(r341024)
 @@ -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>
 
 Modified: branches/2014Q1/emulators/cpmemu/files/patch-ab
 ==============================================================================
 --- branches/2014Q1/emulators/cpmemu/files/patch-ab	Sat Jan 25 13:02:05 2014	(r341023)
 +++ branches/2014Q1/emulators/cpmemu/files/patch-ab	Sat Jan 25 13:03:14 2014	(r341024)
 @@ -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)
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
 


More information about the freebsd-ports-bugs mailing list