Date: Fri, 26 Oct 2012 05:31:59 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306416 - in head/audio/oss: . files Message-ID: <201210260531.q9Q5VxD0029886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Oct 26 05:31:59 2012 New Revision: 306416 URL: http://svn.freebsd.org/changeset/ports/306416 Log: - Add fix to allow building with clang - Trim Makefile header PR: ports/172609 Submitted by: Jan Beich <jbeich@tormail.org> Approved by: makc, avilla (mentors, implicit) Feature safe: yes Modified: head/audio/oss/Makefile (contents, props changed) head/audio/oss/files/patch-setup-srcconf.c (contents, props changed) Modified: head/audio/oss/Makefile ============================================================================== --- head/audio/oss/Makefile Fri Oct 26 05:17:21 2012 (r306415) +++ head/audio/oss/Makefile Fri Oct 26 05:31:59 2012 (r306416) @@ -1,9 +1,5 @@ -# New ports collection makefile for: oss -# Date created: 2007-06-14 -# Whom: Edward Tomasz Napierala <trasz@FreeBSD.org> -# +# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> # $FreeBSD$ -# PORTNAME= oss DISTVERSION= 4.2-build2007 @@ -54,7 +50,7 @@ PROTO_SBINDIR= ${PROTO_DIR}/usr/sbin PROTO_MANDIR= ${PROTO_DIR}/usr/share/man PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss -CONFIGURE_ENV= HOSTCC="${CC}" +CONFIGURE_ENV= CC="${CC}" HOSTCC="${CC}" OPTIONS_DEFINE= VORBIS OPTIONS_DEFAULT=VORBIS Modified: head/audio/oss/files/patch-setup-srcconf.c ============================================================================== --- head/audio/oss/files/patch-setup-srcconf.c Fri Oct 26 05:17:21 2012 (r306415) +++ head/audio/oss/files/patch-setup-srcconf.c Fri Oct 26 05:31:59 2012 (r306416) @@ -9,3 +9,12 @@ } if (strcmp (line, "project") == 0) +@@ -913,7 +913,7 @@ + if (config_phpmake) + fprintf (f, "<?php require getenv(\"PHPMAKE_LIBPATH\") . \"library.php\"; phpmake_makefile_top_rules(); ?>\n"); + +- fprintf (f, "CC=%s\n", conf.ccomp); ++ fprintf (f, "CC=%s\n", targetcc); + // fprintf (f, "LD=ld\n"); + fprintf (f, "HOSTCC=%s\n", hostcc); + fprintf (f, "CPLUSPLUS=%s\n", conf.cplusplus);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210260531.q9Q5VxD0029886>