Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Apr 2020 17:52:36 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532288 - in head/sysutils/xen-guest-tools: . files
Message-ID:  <202004211752.03LHqa9h025524@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Tue Apr 21 17:52:36 2020
New Revision: 532288
URL: https://svnweb.freebsd.org/changeset/ports/532288

Log:
  - fix build for CURRENT
  - speedup build
  PR:		245658

Modified:
  head/sysutils/xen-guest-tools/Makefile
  head/sysutils/xen-guest-tools/files/patch-tools-Makefile

Modified: head/sysutils/xen-guest-tools/Makefile
==============================================================================
--- head/sysutils/xen-guest-tools/Makefile	Tue Apr 21 17:48:06 2020	(r532287)
+++ head/sysutils/xen-guest-tools/Makefile	Tue Apr 21 17:52:36 2020	(r532288)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xen-guest-tools
 PORTVERSION=	4.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.xenproject.org/release/xen/${PORTVERSION}/
 DISTNAME=	xen-${PORTVERSION}
@@ -37,6 +37,7 @@ MAKE_ENV+=	clang=y
 MAKE_ENV+=	CC="${CC}"
 MAKE_ENV+=	CFLAGS="${CFLAGS}"
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV+=	FREEBSD_PORT=y
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/lib
 USE_LDCONFIG=	yes
@@ -57,6 +58,8 @@ PLIST_FILES=	bin/xen-detect \
 		lib/libxentoolcore.so.1
 
 post-patch:
+	${REINPLACE_CMD} -e 's;=xen tools stubdom docs;=tools;' \
+		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's;86|x86_64;86no|x86_64no;' \
 		${WRKSRC}/tools/configure
 

Modified: head/sysutils/xen-guest-tools/files/patch-tools-Makefile
==============================================================================
--- head/sysutils/xen-guest-tools/files/patch-tools-Makefile	Tue Apr 21 17:48:06 2020	(r532287)
+++ head/sysutils/xen-guest-tools/files/patch-tools-Makefile	Tue Apr 21 17:52:36 2020	(r532288)
@@ -1,10 +1,12 @@
 --- tools/Makefile.orig	2019-12-17 14:23:09 UTC
 +++ tools/Makefile
-@@ -15,7 +15,6 @@ SUBDIRS-y += examples
- SUBDIRS-y += hotplug
- SUBDIRS-y += xentrace
- SUBDIRS-$(CONFIG_XCUTILS) += xcutils
--SUBDIRS-$(CONFIG_X86) += firmware
- SUBDIRS-y += console
- SUBDIRS-y += xenmon
- SUBDIRS-y += xenstat
+@@ -50,6 +50,9 @@ endif
+ ifeq ($(CONFIG_RUMP),y)
+ SUBDIRS-y := libs libxc xenstore
+ endif
++ifeq ($(FREEBSD_PORT),y)
++SUBDIRS-y := libs libxc xenstore misc
++endif
+ 
+ # For the sake of linking, set the sys-root
+ ifneq ($(CROSS_COMPILE),)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004211752.03LHqa9h025524>