From patchwork Sat Dec 7 18:40:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180944 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2382661ile; Sat, 7 Dec 2019 10:41:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyCWdfopGNwQVtL3aa2786zss1xIvFUcQIAo5Mh+d4ITSs1sCRpD4+g0PYtlB8n70RXtgEf X-Received: by 2002:a63:1b4e:: with SMTP id b14mr10656291pgm.280.1575744103442; Sat, 07 Dec 2019 10:41:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575744103; cv=none; d=google.com; s=arc-20160816; b=TsASMo2P4jY4Ny/femvjmI5r62sjOa2jviq4pt4ZME9dc5JqrQ5mDFIM0AGzlcvnN3 +WmhJeHxcgRMZfh1ShBVEBGTdbS2yY3oexRHRnNf9EqiAhGs2HSSsjpGfOMtL3lNyo0d Hqzl6yFLPBFrvWNkYCJTESTZtFUlF2IKmVhAZmEUy7WmhlfED+8OtURu08Ba0/YoB0zO uM2AUbcoNjBlPD4IZqv3QF4f86FBDYBGLei6XBBxxIzSBqKMAXdvewIId5l1OtVIjgq5 OLHmYYPKlmN9owcNDrbU7GR22snMEi4rTw29q+YxIDMmHlNLOnDkhVZnP4NqLdBEBh4w hB4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=65k5vPSWceqX9gr/Zz89khbV0ISFaNzRjeqtBqWFLqM=; b=c+UMccx46mk4YcXZ2XRJbkq7wAzhlXgb6Hq0NUeADf6HExUi5Jzm+/3a/jL2saIR9v OD70jrWXHWoiepoF4klLmp9RSC4Ril1vFA0UK22QTTriDzlKgHPWiOHQimGKcvCeQRjS R9w4Hy0is6EMSPvyLubxwbPOphACmKlSPX4JosCJmeWwTjd9zE6LIm49Gt1LY5Ey/lmC qPi7yvxRdyKTFr2g9XfYLdis7dxAEDo7ZmX/Kp4x/p2bKRMjz00/GaZZMmyOnL3uRgPK hHuSFm9l8hWezE+TI+BcvayYhymaRCqU+pXDsiQPT169yDwy1tzL0Qkp+UOiq1gf9isr fX8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="sBMZCg/7"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l12si13946528pgk.350.2019.12.07.10.41.43; Sat, 07 Dec 2019 10:41:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="sBMZCg/7"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 55AD87FA24; Sat, 7 Dec 2019 18:41:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id E961E7C89C for ; Sat, 7 Dec 2019 18:40:56 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id x13so4072853plr.9 for ; Sat, 07 Dec 2019 10:40:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8f3wOXpic+9ezHoa627DES1kdu7hPp45PEJWdQz2zAA=; b=sBMZCg/79RBhlM3OIjtETiHxThaKR4CkBzeuP4wOSz+4owx/Gwy0+f81uoXE63G9Hq qOZFNV820RvJ8le3G1b/K9N2XJIm1jksZD00huNr8l9R1ZGUNMgmpwrZ6zEVd94VLf4R 2O784iHawYCCWs5ehoODjiKBWDvFRKe/g8T6xScLUWXskTDcqLx6cp1BuWMz3XdcwsNM iEQZLuTlKScBKSwhJTVYg1XIfMnwbo0kRCz7dd/AehKON3UaXuNMMgxC+UlRXMI66ylj Eln8HPkzmPz+2mTLKc0V4f9oc6uF19baIJKdGYGd4EcPu6KxwcB5uf+u331Q04p2+AfL f+Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8f3wOXpic+9ezHoa627DES1kdu7hPp45PEJWdQz2zAA=; b=j9/bpBVE7cP2RvjHe++JsVvGynVoMgI+1l6Y7ixI9ILZJmnjqPEiZepHUNo9fQAyIJ mbicEtrrFScOzc+7aPk41OtF4eap8d19yXMQ5BBG7dOjOTQdaArx+ph28Y3iu1SuG5Hp Ar88n6cse34MMVf3F2cAmEpkQ8S8th6LMOFZCOtnFOBkeJtqmf//Dt4MrGJLClFaFrFM LRxt8gubctlOqTP56oDKudawx2D9DdOE996xP119pFtq9I/WoD05cIlEHaO0DQJqDpwB IUXs9txcTDofpTQ3SYRHvfK4LS9asMPt7gdgM/2oeN/RgpRbnn3tg7M0SCpG7O4O7qFT q0uA== X-Gm-Message-State: APjAAAXb+MvIQLH0RH/DqTr/Rw5vs7qE6T+llgvRUT0O4WAxkHHMedFj XJTdevxnJiC8ugKHR+PJQegSxce/o0k= X-Received: by 2002:a17:902:5a04:: with SMTP id q4mr8269844pli.302.1575744056341; Sat, 07 Dec 2019 10:40:56 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::afb7]) by smtp.gmail.com with ESMTPSA id b73sm22129519pfb.72.2019.12.07.10.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 10:40:55 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 7 Dec 2019 10:40:42 -0800 Message-Id: <20191207184042.3826637-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191207184042.3826637-1-raj.khem@gmail.com> References: <20191207184042.3826637-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/2] sysklogd: Fix 2.0.3 upgrade fallouts on musl X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj Cc: Alexander Kanavin --- ...001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 +++++++++++++++++++ .../0002-include-sys-types.h-for-off_t.patch | 29 ++++++++++++ meta/recipes-extended/sysklogd/sysklogd.inc | 2 + 3 files changed, 75 insertions(+) create mode 100644 meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch create mode 100644 meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch -- 2.24.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch new file mode 100644 index 0000000000..b2d45c0a0a --- /dev/null +++ b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch @@ -0,0 +1,44 @@ +From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Dec 2019 10:27:28 -0800 +Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS + +The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and +are not defined in any standard. Using them fails build on musl +libc, its better to avoid them + +Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] +Signed-off-by: Khem Raj +--- + src/syslog.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/syslog.h b/src/syslog.h +index 4fb7627..120a18f 100644 +--- a/src/syslog.h ++++ b/src/syslog.h +@@ -221,7 +221,9 @@ struct syslog_data { + .log_mask = 0xff, \ + } + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + void openlog (const char *, int, int); + void closelog (void); + +@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, + const char *, ...); + void vsyslogp_r (int, struct syslog_data *, const char *, const char *, + const char *, va_list); +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #else /* !__KERNEL__ */ + +-- +2.24.0 + diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch new file mode 100644 index 0000000000..799a7a4c4c --- /dev/null +++ b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch @@ -0,0 +1,29 @@ +From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Dec 2019 10:31:04 -0800 +Subject: [PATCH 2/2] include sys/types.h for off_t + +Fixes +error: unknown type name 'off_t' + +Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] +Signed-off-by: Khem Raj +--- + src/compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/compat.h b/src/compat.h +index a867636..1ef1bf0 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + /* + * The following macro is used to remove const cast-away warnings +-- +2.24.0 + diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index b90911af2b..07edf40326 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ + file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ + file://0002-include-sys-types.h-for-off_t.patch \ file://sysklogd \ " S = "${WORKDIR}/git"