Skip to content
Snippets Groups Projects
Commit af4c1ba8 authored by Zygmunt Krynicki's avatar Zygmunt Krynicki Committed by Stefan Schmidt
Browse files

zmk: Update to version 0.5.1


This version fixes a specific issue with installation of symbolic links,
which affects sysotad. The only patch carried against the package was
integrated upstream.

Signed-off-by: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
parent 68fbec3f
No related branches found
No related tags found
No related merge requests found
......@@ -7,10 +7,9 @@ LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
SRC_URI = "https://github.com/zyga/zmk/releases/download/v${PV}/zmk-${PV}.tar.gz \
file://0001-Retain-customized-CC-and-CXX-from-configure.patch \
"
SRC_URI[md5sum] = "5ed6b855f70e85972094bab078944fdd"
SRC_URI[sha256sum] = "b006f312aba2c6d7bc6d11e08709da7ce4b7dac71612a4a66491797158f1c30b"
SRC_URI[md5sum] = "753acb0dba113f14f1e2a898748bdb13"
SRC_URI[sha256sum] = "541874f8244060acdbf1da3ea19cf3f3074f8b9e40e6873ea546136e88033d93"
DEPENDS += "make-native gawk-native"
......
From b058b32e8a8b007e01110b4363ff3bdcdefb3e50 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <me@zygoon.pl>
Date: Mon, 22 Feb 2021 07:33:31 +0000
Subject: [PATCH] Retain customized CC and CXX from configure
When the configure script is invoked with different --build and --host
and cross compiling mode is enabled, do not clobber CC and CXX that is
provided by the configure environment.
This effectively only sets the cross-compiling names of CC and CXX if
they are not already defined.
This matters because poky passes extensive set of flags via CC and CXX,
so forgetting those can cause compile failures. For example for the
Avenger 96 development board, poky uses a soft-float compiler but
switches to hard-float with an argument embedded in CXX:
CXX=arm-poky-linux-gnueabi-g++ -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard
Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
---
zmk/toolchain.GCC.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/zmk/toolchain.GCC.mk b/zmk/toolchain.GCC.mk
index b39e486..e0e5993 100644
--- a/zmk/toolchain.GCC.mk
+++ b/zmk/toolchain.GCC.mk
@@ -11,8 +11,10 @@ ifneq (,$(Toolchain.CC.IsGcc))
# autoconf/automake compatibility.
ifneq (,$(and $(Configure.Configured),$(Configure.HostArchTriplet),$(Configure.BuildArchTriplet)))
ifneq ($(Configure.BuildArchTriplet),$(Configure.HostArchTriplet))
+ifeq ($(origin CC),default)
CC = $(Configure.HostArchTriplet)-gcc
$(if $(Toolchain.debug),$(info DEBUG: gcc cross-compiler selected CC=$(CC)))
+endif # !default CC
endif # !cross-compiling
endif # !configured
@@ -49,8 +51,10 @@ ifneq (,$(Toolchain.CXX.IsGcc))
# autoconf/automake compatibility.
ifneq (,$(and $(Configure.Configured),$(Configure.HostArchTriplet),$(Configure.BuildArchTriplet)))
ifneq ($(Configure.BuildArchTriplet),$(Configure.HostArchTriplet))
+ifeq ($(origin CXX),default)
CXX = $(Configure.HostArchTriplet)-g++
$(if $(Toolchain.debug),$(info DEBUG: g++ cross-compiler selected CXX=$(CXX)))
+endif # !default CXX
endif # !cross-compiling
endif # !configured
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment