svn commit: r319299 - head/net/socat

Emanuel Haupt ehaupt at FreeBSD.org
Tue May 28 09:12:08 UTC 2013


Author: ehaupt
Date: Tue May 28 09:12:07 2013
New Revision: 319299
URL: http://svnweb.freebsd.org/changeset/ports/319299

Log:
  Handle clang 3.3 fallout. I wish we had a __FreeBSD_version tag from when the
  clang 3.3 import happened, that way we wouldn't have to resort to such hacks.

Modified:
  head/net/socat/Makefile

Modified: head/net/socat/Makefile
==============================================================================
--- head/net/socat/Makefile	Tue May 28 08:41:18 2013	(r319298)
+++ head/net/socat/Makefile	Tue May 28 09:12:07 2013	(r319299)
@@ -24,14 +24,23 @@ MAN1=		socat.1
 PLIST_FILES=	bin/filan bin/procan bin/socat
 PORTDOCS=	EXAMPLES README SECURITY FAQ
 
-.if ${CC} == clang
-CFLAGS+=	-Wno-unused-comparison
-.endif
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+# we could be on HEAD where CC is in fact clang 3.3 but since we have no 
+# __FreeBSD_version tag from when the 3.3 import happened we have to do some
+# probing
+#
+.if(${OSVERSION} >= 1000000)
+_CLANG!=	cc --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+CFLAGS+=	-Wno-unused-comparison
+.endif
+
+.if ${CC} == clang
+CFLAGS+=	-Wno-unused-comparison
+.endif
+
 do-install:
 .for f in filan procan socat
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin


More information about the svn-ports-all mailing list