Date: Thu, 31 Oct 2013 11:02:05 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332220 - in head/sysutils/xen-tools: . files Message-ID: <201310311102.r9VB25EQ048641@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Thu Oct 31 11:02:05 2013 New Revision: 332220 URL: http://svnweb.freebsd.org/changeset/ports/332220 Log: Support STAGE Fix build on HEAD and when gcc is unavailable Approved by: crees (mentor) Added: head/sysutils/xen-tools/files/patch-Config.mk (contents, props changed) head/sysutils/xen-tools/files/patch-config_StdGNU.mk (contents, props changed) Modified: head/sysutils/xen-tools/Makefile Modified: head/sysutils/xen-tools/Makefile ============================================================================== --- head/sysutils/xen-tools/Makefile Thu Oct 31 10:26:03 2013 (r332219) +++ head/sysutils/xen-tools/Makefile Thu Oct 31 11:02:05 2013 (r332220) @@ -13,7 +13,7 @@ COMMENT= Xen tools within FreeBSD domU MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ DISTFILES= xen-${PORTVERSION}.tar.gz -USE_GMAKE= yes +USES= gmake USE_PYTHON= yes ONLY_FOR_ARCHS= amd64 i386 ia64 @@ -31,25 +31,22 @@ PLIST_FILES= lib/libxenstore.so.3.0 \ bin/xenstore-rm \ bin/xenstore-write -NO_STAGE= yes do-build: cd ${WRKSRC}/tools && ${GMAKE} -C include cd ${WRKSRC}/tools/misc && ${GMAKE} xen-detect cd ${WRKSRC}/tools/xenstore && ${GMAKE} clients do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/xen-detect ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore-control ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 ${PREFIX}/lib - -post-install: - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-chmod - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-exists - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-list - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-ls - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-read - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-rm - ${LN} -sf ${PREFIX}/bin/xenstore ${PREFIX}/bin/xenstore-write + ${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/xen-detect ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore-control ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 ${STAGEDIR}${PREFIX}/lib + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-chmod + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-exists + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-list + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-ls + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-read + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-rm + ${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-write .include <bsd.port.mk> Added: head/sysutils/xen-tools/files/patch-Config.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-tools/files/patch-Config.mk Thu Oct 31 11:02:05 2013 (r332220) @@ -0,0 +1,14 @@ +--- Config.mk.orig 2013-10-30 14:55:12.664590030 -0500 ++++ Config.mk 2013-10-30 14:55:29.462580127 -0500 +@@ -13,9 +13,8 @@ + SHELL ?= /bin/sh + + # Tools to run on system hosting the build +-HOSTCC = gcc +-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer +-HOSTCFLAGS += -fno-strict-aliasing ++HOSTCC = ${CC} ++HOSTCFLAGS = ${CFLAGS} + + DISTDIR ?= $(XEN_ROOT)/dist + DESTDIR ?= / Added: head/sysutils/xen-tools/files/patch-config_StdGNU.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-tools/files/patch-config_StdGNU.mk Thu Oct 31 11:02:05 2013 (r332220) @@ -0,0 +1,10 @@ +--- config/StdGNU.mk.orig 2013-10-30 14:56:35.070570838 -0500 ++++ config/StdGNU.mk 2013-10-30 14:56:42.021581306 -0500 +@@ -1,6 +1,6 @@ + AS = $(CROSS_COMPILE)as + LD = $(CROSS_COMPILE)ld +-CC = $(CROSS_COMPILE)gcc ++CC ?= $(CROSS_COMPILE)gcc + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311102.r9VB25EQ048641>