Attachment 226270 Details for Bug 256978 – Proposed fix

[patch] Proposed fix

0001-sysutils-xen-tools-fix-build-with-go-installed.patch (text/plain), 2.85 KB, created by Roger Pau Monné on 2021-07-06 14:51:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Pau Monné

Created: 2021-07-06 14:51:10 UTC

Size: 2.85 KB

patch

obsolete

>From 1d6696575fcfa2ab962ef8fad2f50a1e74a5c820 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <royger@FreeBSD.org>
>Date: Tue, 6 Jul 2021 16:05:55 +0200
>Subject: [PATCH] sysutils/xen-tools: fix build with go installed
>
>---
> sysutils/xen-tools/Makefile                   |  5 ++-
> ...01-tools-go-honor-append-build-flags.patch | 33 +++++++++++++++++++
> 2 files changed, 37 insertions(+), 1 deletion(-)
> create mode 100644 sysutils/xen-tools/files/0001-tools-go-honor-append-build-flags.patch
>
>diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
>index 92263d86ee17..41bcfa94a657 100644
>--- a/sysutils/xen-tools/Makefile
>+++ b/sysutils/xen-tools/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	xen
> PKGNAMESUFFIX=	-tools
> PORTVERSION=	4.15.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils emulators
> MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
> 
>@@ -58,6 +58,9 @@ DOCS_ALL_TARGET=	docs
> INSTALL_TARGET=		install-tools
> DOCS_INSTALL_TARGET=	install-docs
> 
>+# Fix build with go installed.
>+EXTRA_PATCHES+=	${PATCHDIR}/0001-tools-go-honor-append-build-flags.patch:-p1
>+
> .include <bsd.port.options.mk>
> 
> .if ${OPSYS} != FreeBSD
>diff --git a/sysutils/xen-tools/files/0001-tools-go-honor-append-build-flags.patch b/sysutils/xen-tools/files/0001-tools-go-honor-append-build-flags.patch
>new file mode 100644
>index 000000000000..d3ab8cb78b15
>--- /dev/null
>+++ b/sysutils/xen-tools/files/0001-tools-go-honor-append-build-flags.patch
>@@ -0,0 +1,33 @@
>+From fc345ccc1effcf89239aaf452071a8cf35b43934 Mon Sep 17 00:00:00 2001
>+From: Roger Pau Monne <roger.pau@citrix.com>
>+Date: Tue, 6 Jul 2021 16:03:24 +0200
>+Subject: [PATCH] tools/go: honor append build flags
>+MIME-Version: 1.0
>+Content-Type: text/plain; charset=UTF-8
>+Content-Transfer-Encoding: 8bit
>+
>+Make the go build use APPEND_{C/LD}FLAGS when necessary, just like
>+other parts od the build.
>+
>+Reported-by: Ting-Wei Lan <lantw44@gmail.com>
>+Signed-off-by: Roger Pau MonnÃ© <roger.pau@citrix.com>
>+---
>+ tools/golang/xenlight/Makefile | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile
>+index e394ef9b2b..64671f246c 100644
>+--- a/tools/golang/xenlight/Makefile
>++++ b/tools/golang/xenlight/Makefile
>+@@ -27,7 +27,7 @@ GOXL_GEN_FILES = types.gen.go helpers.gen.go
>+ # so that it can find the actual library.
>+ .PHONY: build
>+ build: xenlight.go $(GOXL_GEN_FILES)
>+-	CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_libxenlight) -L$(XEN_libxentoollog)" $(GO) build -x
>++	CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog) $(APPEND_CFLAGS)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_libxenlight) -L$(XEN_libxentoollog) $(APPEND_LDFLAGS)" $(GO) build -x
>+ 
>+ .PHONY: install
>+ install: build
>+-- 
>+2.31.1
>+
>-- 
>2.31.1
>

Actions: View | Diff

Attachments on bug 256978: 226220 | 226270