mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
tcf-agent: upgrade to 1.7.0
Remove 0001-canonicalize_file_name-is-specific-to-glibc.patch as upstream has integrated musl support. (From OE-Core rev: 4c243b71a0a05acc3b2a8bd327a8c97dcc08d3c5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e3af86e98d
commit
b865fb4fcb
-46
@@ -1,46 +0,0 @@
|
|||||||
From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Thu, 7 Jan 2016 22:37:48 +0000
|
|
||||||
Subject: [PATCH] canonicalize_file_name is specific to glibc
|
|
||||||
|
|
||||||
When on Linux and not using glibc then we need to define
|
|
||||||
canonicalize_file_name() API, therefore add a check for finding out if
|
|
||||||
its not glibc
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
agent/tcf/framework/mdep.c | 2 +-
|
|
||||||
agent/tcf/framework/mdep.h | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c
|
|
||||||
index 2b52ca8..7d09655 100644
|
|
||||||
--- a/agent/tcf/framework/mdep.c
|
|
||||||
+++ b/agent/tcf/framework/mdep.c
|
|
||||||
@@ -1042,7 +1042,7 @@ char * canonicalize_file_name(const char * path) {
|
|
||||||
return strdup(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
-#elif defined(__UCLIBC__)
|
|
||||||
+#elif defined(__UCLIBC__) || !defined(__GLIBC__)
|
|
||||||
|
|
||||||
char * canonicalize_file_name(const char * path) {
|
|
||||||
return realpath(path, NULL);
|
|
||||||
diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h
|
|
||||||
index 1e718a2..187c399 100644
|
|
||||||
--- a/agent/tcf/framework/mdep.h
|
|
||||||
+++ b/agent/tcf/framework/mdep.h
|
|
||||||
@@ -276,7 +276,7 @@ extern int loc_clock_gettime(int, struct timespec *);
|
|
||||||
|
|
||||||
#define O_BINARY 0
|
|
||||||
|
|
||||||
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
|
||||||
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || !defined(__GLIBC__)
|
|
||||||
# define O_LARGEFILE 0
|
|
||||||
extern char ** environ;
|
|
||||||
extern char * canonicalize_file_name(const char * path);
|
|
||||||
--
|
|
||||||
2.7.0
|
|
||||||
|
|
||||||
@@ -1,16 +1,17 @@
|
|||||||
Upstream-Status: Inappropriate [poky-specific fix]
|
Actually pass the arguments to RANLIB.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
Index: agent/Makefile.inc
|
Index: agent/Makefile.inc
|
||||||
===================================================================
|
===================================================================
|
||||||
--- agent.orig/Makefile.inc
|
--- a/Makefile.inc
|
||||||
+++ agent/Makefile.inc
|
+++ b/Makefile.inc
|
||||||
@@ -88,6 +88,9 @@ ifneq ($(OPSYS),Windows)
|
@@ -92,6 +92,7 @@ ifeq ($(OPSYS),GNU/Linux)
|
||||||
ifneq ($(CC),g++)
|
OPTS += -DUSE_uuid_generate=0
|
||||||
OPTS += -Wmissing-prototypes
|
|
||||||
endif
|
endif
|
||||||
+ ifneq ($(RANLIB),)
|
OPTS += -DENABLE_arch_$(shell uname -m)
|
||||||
+ RANLIB += $@
|
+ RANLIB += $@
|
||||||
+ endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Compiler flags definition
|
ifneq ($(OPSYS),Windows)
|
||||||
|
|||||||
@@ -5,14 +5,13 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/"
|
|||||||
LICENSE = "EPL-1.0 | EDL-1.0"
|
LICENSE = "EPL-1.0 | EDL-1.0"
|
||||||
LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
|
LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
|
||||||
|
|
||||||
SRCREV = "2dddd5f440a15d5406032fac20f206484513646f"
|
SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f"
|
||||||
PV = "1.4.0+git${SRCPV}"
|
PV = "1.7.0+git${SRCPV}"
|
||||||
|
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||||
SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent;branch=1.4_neon_bugfix \
|
SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \
|
||||||
file://fix_ranlib.patch \
|
file://fix_ranlib.patch \
|
||||||
file://ldflags.patch \
|
file://ldflags.patch \
|
||||||
file://0001-canonicalize_file_name-is-specific-to-glibc.patch;striplevel=2 \
|
|
||||||
file://tcf-agent.init \
|
file://tcf-agent.init \
|
||||||
file://tcf-agent.service \
|
file://tcf-agent.service \
|
||||||
"
|
"
|
||||||
|
|||||||
Reference in New Issue
Block a user