diff options
| author | feld <feld@FreeBSD.org> | 2013-10-31 19:02:05 +0800 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2013-10-31 19:02:05 +0800 |
| commit | b02f283fe2fc01702159cb96eb91c17e34ed5724 (patch) | |
| tree | aca2f0c1e9b7287f431d332e064b054b5e7cdad0 /sysutils | |
| parent | ad78d4138f0c3b6f9a028bd5da92180c85ad28f7 (diff) | |
| download | freebsd-ports-gnome-b02f283fe2fc01702159cb96eb91c17e34ed5724.tar.gz freebsd-ports-gnome-b02f283fe2fc01702159cb96eb91c17e34ed5724.tar.zst freebsd-ports-gnome-b02f283fe2fc01702159cb96eb91c17e34ed5724.zip | |
Support STAGE
Fix build on HEAD and when gcc is unavailable
Approved by: crees (mentor)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xen-tools/Makefile | 27 | ||||
| -rw-r--r-- | sysutils/xen-tools/files/patch-Config.mk | 14 | ||||
| -rw-r--r-- | sysutils/xen-tools/files/patch-config_StdGNU.mk | 10 |
3 files changed, 36 insertions, 15 deletions
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index 886d72958f0f..f2f56702a56c 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -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> diff --git a/sysutils/xen-tools/files/patch-Config.mk b/sysutils/xen-tools/files/patch-Config.mk new file mode 100644 index 000000000000..825ad460e515 --- /dev/null +++ b/sysutils/xen-tools/files/patch-Config.mk @@ -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 ?= / diff --git a/sysutils/xen-tools/files/patch-config_StdGNU.mk b/sysutils/xen-tools/files/patch-config_StdGNU.mk new file mode 100644 index 000000000000..4a2c69b827cb --- /dev/null +++ b/sysutils/xen-tools/files/patch-config_StdGNU.mk @@ -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 |