From 1a312f283e9570b69010d025523ca99759cae48e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Sun, 12 Jun 2022 01:00:02 -0700 Subject: docker-distribution: fix build error on new hosts Fix settings for GOROOT, CGO_CFLAGS and CGO_LDFLAGS. The previous setting for GOROOT is no longer valid as the directory does not exist for now. So adjust the GOROOT setting. Currently CGO_CFLAGS is set to use BUILDSDK_CFLAGS, and this is incorrect. We need target flags instead of SDK related flags. Such setting happens to work for some hosts. However, when building on newer hosts, we get QA error like below: ERROR: docker-distribution-v2.7.1-r0 do_package_qa: QA Issue: /usr/sbin/registry contained in package docker-registry requires libc.so.6(GLIBC_2.34)(64bit), but no providers found in RDEPENDS_docker-registry? [file-rdeps] The above error was found on hardknott on host Fedora 35. Tracking down the error and I found it's using host stuff which is likely to be caused by using incorrect CGO_CFLAGS. As the master branch is using the same settings, it has the same issue. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/docker-distribution/docker-distribution_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index 395694aa..89c59802 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb @@ -25,15 +25,15 @@ EXTRA_OEMAKE="BUILDTAGS=''" do_compile() { export GOARCH="${TARGET_GOARCH}" export GOPATH="${WORKDIR}/git/" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" + export GOROOT="${STAGING_LIBDIR}/go" # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries export CGO_ENABLED="1" export CFLAGS="" export LDFLAGS="" - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_CFLAGS="${TARGET_CFLAGS}" export GO_GCFLAGS="" - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" export GO111MODULE=off cd ${S} -- cgit v1.2.3-54-g00ecf