diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2013-09-25 11:49:38 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2013-09-25 11:49:38 +0800 |
| commit | f20e82bcf0a88687572200492dfc923fe862e304 (patch) | |
| tree | 67220fe39e8d9b396b2235d9e9fe4e4402ef3ce7 /sysutils/ciso | |
| parent | 97a4c2caa8dc0acb750e9540f6cf442340b2d7c2 (diff) | |
| download | freebsd-ports-gnome-f20e82bcf0a88687572200492dfc923fe862e304.tar.gz freebsd-ports-gnome-f20e82bcf0a88687572200492dfc923fe862e304.tar.zst freebsd-ports-gnome-f20e82bcf0a88687572200492dfc923fe862e304.zip | |
- Fix build with clang
PR: 182168
Submitted by: Vasily Chashchin <blttll@gmail.com> (maintainer)
Diffstat (limited to 'sysutils/ciso')
| -rw-r--r-- | sysutils/ciso/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/ciso/files/patch-Makefile | 31 |
2 files changed, 25 insertions, 9 deletions
diff --git a/sysutils/ciso/Makefile b/sysutils/ciso/Makefile index cb9d4db4ab80..4aa4d87987d6 100644 --- a/sysutils/ciso/Makefile +++ b/sysutils/ciso/Makefile @@ -3,14 +3,13 @@ PORTNAME= ciso PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= blttll@gmail.com COMMENT= A tool to compress ISO images to CSO format - USE_DOS2UNIX= yes PLIST_FILES= bin/ciso diff --git a/sysutils/ciso/files/patch-Makefile b/sysutils/ciso/files/patch-Makefile index 9b84bea8e104..965e529d5996 100644 --- a/sysutils/ciso/files/patch-Makefile +++ b/sysutils/ciso/files/patch-Makefile @@ -1,12 +1,29 @@ ---- Makefile.orig 2007-11-04 17:49:10.000000000 +0300 -+++ Makefile 2007-11-04 17:50:04.000000000 +0300 -@@ -1,6 +1,6 @@ --DESTDIR = +--- Makefile.bak 2013-09-12 16:31:40.000000000 +0000 ++++ Makefile 2013-09-12 16:33:23.000000000 +0000 +@@ -1,17 +1,19 @@ +-DESTDIR = -prefix = /usr -USRBINDIR = $(DESTDIR)$(prefix)/bin +destdir = ${DESTDIR} +prefix = ${PREFIX} +USRBINDIR = $(destdir)$(prefix)/bin - - CC = $(CROSS_COMPILE)gcc - LD = $(CROSS_COMPILE)gcc + +-CC = $(CROSS_COMPILE)gcc +-LD = $(CROSS_COMPILE)gcc + INSTALL = install + ++.if ${CC} == "clang" ++CFLAGS += -Wno-format -Wno-tautological-compare ++.endif ++ + all : ciso + ciso : ciso.o +- gcc -o ciso ciso.o -lz ++ ${CC} ${CFLAGS} -o ciso ciso.o -lz + + ciso.o : ciso.c +- gcc -o ciso.o -c ciso.c ++ ${CC} ${CFLAGS} -o ciso.o -c ciso.c + + install : + $(INSTALL) -m 755 ciso $(USRBINDIR)/ciso |