From patchwork Thu Sep 24 17:20:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1370797 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=me9HA7yQ; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4By1z05cmSz9sTr for ; Fri, 25 Sep 2020 03:20:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1D49220462; Thu, 24 Sep 2020 17:20:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0rspjqWch-NR; Thu, 24 Sep 2020 17:20:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7654120493; Thu, 24 Sep 2020 17:20:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6C03F1BF859 for ; Thu, 24 Sep 2020 17:20:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 688D286A2B for ; Thu, 24 Sep 2020 17:20:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HqaRPDK9NE2T for ; Thu, 24 Sep 2020 17:20:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A1CC686A29 for ; Thu, 24 Sep 2020 17:20:36 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id q9so170417wmj.2 for ; Thu, 24 Sep 2020 10:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5TP/yHdDFpkbJxxA/MFA6H1xtcztWtfg7JPdYmXNXQg=; b=me9HA7yQpXqDc7vjHrAZLHMHXswnMlU69Cw/Uf2VPaf6gmDP7gl1KccPAw6jUayISN 9+8xGe3P+a9D/qxTLs4OL4O8nFfdMDdO5a7pkKeNC+Dbl5TMgwESKs0SrFLTuGUYtkSZ CKeBegK/kkKqo4lBnGVhOfowzB2EdK/guNBIKUtTFwajmS2JFgfxtRLwoq6Kpqy6vbS6 6pGaqeI9jq6v4gbqhvbAGvOYljgsYFTm4QZ4ZYFMsSX5R6CpfKKkrRolSElHuKU0B/mb 9U5FxtKkTRd92ADde109TSXiTfxDNB5HQyi+b7TBUUWoUV8IcZwpT+BSUAMeIQiA+t8j I2Hw== 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:mime-version :content-transfer-encoding; bh=5TP/yHdDFpkbJxxA/MFA6H1xtcztWtfg7JPdYmXNXQg=; b=YHoN6k+G/n9n0Q3bx2L2uawxTUjzV0WQr1MEqYnhs9/o4ZySZs77Xc8M63lNbYOqNR NSTa2taV6xk7q8/r6WjIriWNhNNEq7gM3ShuHauYpMV6fKwshCqqS74RldWNPdCY1XKP umIpB0UBODFnUL0BIU+8VHiJ3JxcgpFLOcLg5Wjq2qrNCDJxDLzPbRlUN5D8JiW0X/Z1 58G8acBRTP6o2IFtbtRY1066eWhsPgEk5ZduD1tXOag7jB2WfEATkiXi6rhpUkkxGOUA 8jt0ZsLS+sqianVFdthkUHZTl2JbmNFP2p9gIkhlCX5fp1lJ2G+ZKsknnRQJ5zdmByEd CItQ== X-Gm-Message-State: AOAM530VWe8q8wZ10C8yAKr2mDxqAZZPBWL7M+Z4fXy+ihw/VW5aIo0D 1UyueDj+Yf/mhCzajYkSJHJRPumAgfc= X-Google-Smtp-Source: ABdhPJyjaLCzzFqUXiMdYx0ligByp0XHIKDv9qHIsE4M7l2Os5QlqYwIbgwk2OvOWuYGVu8FksNaVA== X-Received: by 2002:a1c:9ecb:: with SMTP id h194mr223792wme.140.1600968034609; Thu, 24 Sep 2020 10:20:34 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id z8sm4357917wrl.11.2020.09.24.10.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 10:20:33 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 24 Sep 2020 19:20:18 +0200 Message-Id: <20200924172018.904670-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/log4cxx: fix build without wchar X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix build with log4cxx in version 0.11.0 Fixes: - http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c Signed-off-by: Fabrice Fontaine --- .../0001-fix-build-without-wchar.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/log4cxx/0001-fix-build-without-wchar.patch diff --git a/package/log4cxx/0001-fix-build-without-wchar.patch b/package/log4cxx/0001-fix-build-without-wchar.patch new file mode 100644 index 0000000000..c297c76da3 --- /dev/null +++ b/package/log4cxx/0001-fix-build-without-wchar.patch @@ -0,0 +1,41 @@ +From f6507390138fa599bc93bafc0552cfb3128b6cd7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 08:47:37 +0200 +Subject: [PATCH] fix build without wchar + +Disable wencode without wchar or the build will fail on: + +odbcappender.cpp: In static member function 'static void log4cxx::db::ODBCAppender::encode(wchar_t**, const LogString&, log4cxx::helpers::Pool&)': +odbcappender.cpp:362:22: error: 'wencode' is not a member of 'log4cxx::helpers::Transcoder' + *dest = Transcoder::wencode(src, p); + ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/apache/logging-log4cxx/pull/42] +--- + src/main/cpp/odbcappender.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp +index 6bfa519e..51ec5cd0 100644 +--- a/src/main/cpp/odbcappender.cpp ++++ b/src/main/cpp/odbcappender.cpp +@@ -357,10 +357,12 @@ void ODBCAppender::setSql(const LogString& s) + } + } + ++#if LOG4CXX_WCHAR_T_API + void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p) + { + *dest = Transcoder::wencode(src, p); + } ++#endif + + void ODBCAppender::encode(unsigned short** dest, + const LogString& src, Pool& p) +-- +2.28.0 +