Displaying 3 results from an estimated 3 matches for "a60c9ba".
2013 Dec 12
4
[PATCH 1/2] golang: Fix for out-of-tree builds
...un golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
+ AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
AC_MSG_RESULT([yes])
# Substitute some golang environment.
diff --git a/golang/Makefile.am b/golang/Makefile.am
index a7dd1b2..a60c9ba 100644
--- a/golang/Makefile.am
+++ b/golang/Makefile.am
@@ -44,6 +44,7 @@ golangpkg_DATA = \
pkg/$(GOOS)_$(GOARCH)/$(pkg).a
pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
+ -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/src $(builddir)/src
$(top_builddir)/run $(GOLANG...
2013 Dec 12
0
[PATCH 2/2] golang: Don't run launch test if appliance has not been built.
---
golang/Makefile.am | 7 ++++++-
golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/golang/Makefile.am b/golang/Makefile.am
index a60c9ba..f59488e 100644
--- a/golang/Makefile.am
+++ b/golang/Makefile.am
@@ -37,6 +37,11 @@ EXTRA_DIST = \
if HAVE_GOLANG
+GOFLAGS =
+if ENABLE_APPLIANCE
+GOFLAGS += -tags appliance
+endif
+
golangpkgdir = $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/$(pkg)
golangsrcdir = $(GOROOT)/src/pkg/$(pkg)
@@ -49,7 +54...
2013 Dec 13
0
Re: [PATCH 1/2] golang: Fix for out-of-tree builds
...to the above part.
I think the vvv below part is a hack and we shouldn't put it upstream.
I appreciate how complicated Go packaging is, as it defies proper
distro packaging, but I still don't want to take this.
> diff --git a/golang/Makefile.am b/golang/Makefile.am
> index a7dd1b2..a60c9ba 100644
> --- a/golang/Makefile.am
> +++ b/golang/Makefile.am
> @@ -44,6 +44,7 @@ golangpkg_DATA = \
> pkg/$(GOOS)_$(GOARCH)/$(pkg).a
>
> pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
> + -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/src $(builddir)...