Date: Thu, 27 Jun 2013 21:45:00 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> 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 Message-ID: <201306272145.r5RLj0ui090713@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306272145.r5RLj0ui090713>