From 601116752155102cf520144e8ef898adf448ce0a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 6 Sep 2024 15:14:54 -0300 Subject: imx-cst: Remove unused patch Since the update to version 3.4.0, the imx-cst patch is no longer used. Remove the unused imx-cst patch. Signed-off-by: Fabio Estevam --- .../cst/files/0001-fix-err-msg-linking.patch | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch deleted file mode 100644 index a3f5c8288..000000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch +++ /dev/null @@ -1,56 +0,0 @@ -NXP uses weaken to solve conflict in linking. -On Ubuntu 22.04(LTS) this fails to link cst with libcrypto. - -The patch fixes the conflict in the code itself. -It restricts the scope of err_msg to the module. - -Upstream-Status: Inappropriate [i.MX specific] -Signed-off-by: Walter Schweizer ----- -diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk -index 1c0842b..9c46cc4 100644 ---- a/code/cst/code/build/make/rules.mk -+++ b/code/cst/code/build/make/rules.mk -@@ -25,11 +25,11 @@ LFLAGS := -t - %.a: - @echo "Create archive $@" - $(AR) $(ARFLAGS) $@ $^ --ifneq ($(OSTYPE),mingw32) --ifneq ($(OSTYPE),osx) -- $(OBJCOPY) --weaken $@ --endif --endif -+#ifneq ($(OSTYPE),mingw32) -+#ifneq ($(OSTYPE),osx) -+# $(OBJCOPY) --weaken $@ -+#endif -+#endif - - %.exe: - @echo "Link $@" -diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c -index fb1e8aa..1e993ee 100644 ---- a/code/cst/code/front_end/src/acst.c -+++ b/code/cst/code/front_end/src/acst.c -@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - /*=========================================================================== - LOCAL VARIABLES - =============================================================================*/ --char err_msg[MAX_ERR_MSG_BYTES]; -+static char err_msg[MAX_ERR_MSG_BYTES]; - - /*=========================================================================== - LOCAL FUNCTION PROTOTYPES -diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c -index 678dc17..9014b2a 100644 ---- a/code/cst/code/front_end/src/misc_helper.c -+++ b/code/cst/code/front_end/src/misc_helper.c -@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - /*=========================================================================== - LOCAL VARIABLES - =============================================================================*/ --char err_msg[MAX_ERR_MSG_BYTES]; -+static char err_msg[MAX_ERR_MSG_BYTES]; - - /*=========================================================================== - LOCAL FUNCTION PROTOTYPES -- cgit v1.2.3-54-g00ecf