[meta-virtualization] [PATCH] docker: drop hardcoded CC for cross compile

Hongxu Jia hongxu.jia at windriver.com
Wed Jul 17 02:50:40 PDT 2019


On 7/17/19 5:01 PM, Hongxu Jia wrote:
> Since commit applied in moby [61a3285 Support cross-compile for arm]
> it hardcoded var-CC to support cross-compile for arm
>
> Drop hardcoded CC and use Yocto var-CC to instead
>
> https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372
>
> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> ---
>   recipes-containers/docker/docker_git.bb            |  3 +-
>   .../0001-drop-hardcoded-CC-for-cross-compile.patch | 48 ++++++++++++++++++++++
>   2 files changed, 50 insertions(+), 1 deletion(-)
>   create mode 100644 recipes-containers/docker/files/0001-drop-hardcoded-CC-for-cross-compile.patch
>
> diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
> index 5b2f3b0..c1308e6 100644
> --- a/recipes-containers/docker/docker_git.bb
> +++ b/recipes-containers/docker/docker_git.bb
> @@ -43,7 +43,8 @@ SRC_URI = "\
>   	git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
>   	git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
>   	file://docker.init \
> -        file://0001-libnetwork-use-GO-instead-of-go.patch \
> +	file://0001-libnetwork-use-GO-instead-of-go.patch \
> +	file://0001-drop-hardcoded-CC-for-cross-compile.patch \
>   	"
>   
>   require docker.inc
> diff --git a/recipes-containers/docker/files/0001-drop-hardcoded-CC-for-cross-compile.patch b/recipes-containers/docker/files/0001-drop-hardcoded-CC-for-cross-compile.patch
> new file mode 100644
> index 0000000..6fc5214
> --- /dev/null
> +++ b/recipes-containers/docker/files/0001-drop-hardcoded-CC-for-cross-compile.patch
> @@ -0,0 +1,48 @@
> +From d97736afa7bc3e509c3671be8add82ff0a7859a6 Mon Sep 17 00:00:00 2001
> +From: Hongxu Jia <hongxu.jia at windriver.com>
> +Date: Wed, 17 Jul 2019 16:41:36 +0800
> +Subject: [PATCH] drop hardcoded CC for cross compile
> +
> +Since commit applied in moby [61a3285 Support cross-compile for arm]
> +it hardcoded var-CC to support cross-compile for arm
> +
> +Drop hardcoded CC and use Yocto var-CC to instead
> +
> +https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372
> +
> +Upstream-Status: Inappropriate [oe specific]
> +

Please drop this fix, I try to contribute the fix to upstream, V2 incoming

//Hongxu

> +Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> +---
> + src/import/hack/make/.binary | 4 ----
> + 1 file changed, 4 deletions(-)
> +
> +diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary
> +index 53de674..177dd42 100644
> +--- a/src/import/hack/make/.binary
> ++++ b/src/import/hack/make/.binary
> +@@ -50,21 +50,17 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC
> + 		linux/arm)
> + 			case "${GOARM}" in
> + 			5|"")
> +-				export CC=arm-linux-gnueabi-gcc
> + 				export CGO_ENABLED=1
> + 				;;
> + 			7)
> +-				export CC=arm-linux-gnueabihf-gcc
> + 				export CGO_ENABLED=1
> + 				;;
> + 			esac
> + 			;;
> + 		linux/arm64)
> +-			export CC=aarch64-linux-gnu-gcc
> + 			export CGO_ENABLED=1
> + 			;;
> + 		linux/amd64)
> +-			export CC=x86_64-linux-gnu-gcc
> + 			export CGO_ENABLED=1
> + 			;;
> + 	esac
> +--
> +2.7.4
> +




More information about the meta-virtualization mailing list