From owner-svn-ports-all@FreeBSD.ORG Thu Jun 27 21:45:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8266FA7D; Thu, 27 Jun 2013 21:45:01 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5B41810CD; Thu, 27 Jun 2013 21:45:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RLj1xS090719; Thu, 27 Jun 2013 21:45:01 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RLj0ui090713; Thu, 27 Jun 2013 21:45:00 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201306272145.r5RLj0ui090713@svn.freebsd.org> From: Juergen Lock Date: Thu, 27 Jun 2013 21:45:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321908 - in head/emulators: kqemu-kmod kqemu-kmod-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 21:45:01 -0000 Author: nox Date: Thu Jun 27 21:45:00 2013 New Revision: 321908 URL: http://svnweb.freebsd.org/changeset/ports/321908 Log: Actually fix build with gcc46 when bsd.gcc.mk passes LDFLAGS with -Wl,... Modified: head/emulators/kqemu-kmod-devel/Makefile head/emulators/kqemu-kmod/Makefile Modified: head/emulators/kqemu-kmod-devel/Makefile ============================================================================== --- head/emulators/kqemu-kmod-devel/Makefile Thu Jun 27 21:44:53 2013 (r321907) +++ head/emulators/kqemu-kmod-devel/Makefile Thu Jun 27 21:45:00 2013 (r321908) @@ -40,8 +40,11 @@ PLIST_FILES+= "@cwd" MAKEFILE= Makefile.freebsd +MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//} +MAKE_ARGS+= CWARNFLAGS=-Wall + .if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 +GMAKE_ARGS+= ARCH=x86_64 .endif # install where x11/nvidia-driver does also: @@ -72,8 +75,8 @@ post-patch: do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys) - @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}) - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} CWARNFLAGS=-Wall ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) Modified: head/emulators/kqemu-kmod/Makefile ============================================================================== --- head/emulators/kqemu-kmod/Makefile Thu Jun 27 21:44:53 2013 (r321907) +++ head/emulators/kqemu-kmod/Makefile Thu Jun 27 21:45:00 2013 (r321908) @@ -40,8 +40,11 @@ PLIST_FILES+= "@cwd" MAKEFILE= Makefile.freebsd +MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//} +MAKE_ARGS+= CWARNFLAGS=-Wall + .if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 +GMAKE_ARGS+= ARCH=x86_64 .endif # install where x11/nvidia-driver does also: @@ -63,8 +66,8 @@ post-patch: do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys) - @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}) - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} CWARNFLAGS=-Wall ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})