From patchwork Mon Sep 28 19:17:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1372865 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=gMh/CcNx; 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 4C0XNG4Gnyz9sT6 for ; Tue, 29 Sep 2020 05:17:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AF12920009; Mon, 28 Sep 2020 19:17:47 +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 3qHkH5UtV0rg; Mon, 28 Sep 2020 19:17:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 30EEA2001C; Mon, 28 Sep 2020 19:17:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E90EB1BF397 for ; Mon, 28 Sep 2020 19:17:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D9D0D86F82 for ; Mon, 28 Sep 2020 19:17:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EkRzQYNZr9pe for ; Mon, 28 Sep 2020 19:17:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9607386F5C for ; Mon, 28 Sep 2020 19:17:41 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id z4so2586091wrr.4 for ; Mon, 28 Sep 2020 12:17:41 -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=oM/wXdkFZFLOgzb7otbmqQbikSEjrOxpl47wxc+ztU4=; b=gMh/CcNxT94n74xEKHoVa3nUnyPVH2uRU3quiCJAtckUMN1+6/y6rMIChdKqGqpxj7 YbvJI8Knnlc0o+u7Meu0SpTSkMHT08Qpv+OH2I6hHz7AKfDZtsPirL3BHydbVGtiVlTd L3Ws2U5PAyhucylYBTbPShLoWK0XwTJSOHYQnAifRvX3mbBi8zc9CfwFhp6+1BL50rWP DOyVnDN7BgBmY9VLyJ48OeL/UkNPcPsGm+f/u9ClW8heLXVDeyjBpUxfL5/Gx1VgG/eH 8yhBRHk8XsiyNmnRiKrFIb/v6GGTRAtxbGV4gpvZrW9N20EFn3p9AuZCelrsjMEJwXBu YcNA== 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=oM/wXdkFZFLOgzb7otbmqQbikSEjrOxpl47wxc+ztU4=; b=CcLWelufC55SdnQ5EwZST8k1aLy+ebu7NNcqe1Xvj/k6tBNpAQkf42fl6jKje08/Df nE+n3GDcUFjLmXZHJEyrlJ4ScDfd37ulWYXSAhklx+KvBac1DqhQomnzBGoPj6MbalN2 XzibG/Ec+PCtoGfg/kASFeTz1Vpf91UC83TCMfZwooPIYTLzZZERpLkc+2oY6Ww0N2nc 260BWebimpcBFjJBVh2LJjT6EW33bfmvduLLT45Kc6just+UlbHUQlFi0we6V8FoH7/c 60Ij2XcmAsyAw2zt2CTw1wJEpgBb/DywJdj7kQCuZ9Ujc27TsuddDYzRbl1xxGsh3sNJ U5pw== X-Gm-Message-State: AOAM532l87N0/+ly1Uhg2/GoJ3Fq/KmijrRBVDdNCSQBxoJ9da1+CSQu 01dC1VH2y5/Xw7ZdYSt6EBqcCIh+rgw= X-Google-Smtp-Source: ABdhPJyCvcqzH7WMWOxrKkjJQa4UXI8kFmhLdODebAD564hqqjcGE1Q1/ND/AFF6w2ywx2u3AIhdxw== X-Received: by 2002:a5d:4246:: with SMTP id s6mr2357wrr.414.1601320659604; Mon, 28 Sep 2020 12:17:39 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id u126sm3059025wmu.9.2020.09.28.12.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 12:17:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 28 Sep 2020 21:17:30 +0200 Message-Id: <20200928191730.36288-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 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 --- Changes v1 -> v2: - Retrieve upstream patch .../0001-fix-build-without-wchar.patch | 55 +++++++++++++++++++ 1 file changed, 55 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..fc0e7be5c9 --- /dev/null +++ b/package/log4cxx/0001-fix-build-without-wchar.patch @@ -0,0 +1,55 @@ +From 1fa70eaf24d75e84625f22779ec347fd29bf1ae6 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 +[Retrieved from: +https://github.com/apache/logging-log4cxx/commit/f171f818c798d48631d5b45851e4593953f31d9c] +--- + src/main/cpp/odbcappender.cpp | 2 ++ + src/main/include/log4cxx/db/odbcappender.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp +index 6bfa519e..218df132 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 || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32) + 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) +diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h +index a26bc35b..fdc144ff 100644 +--- a/src/main/include/log4cxx/db/odbcappender.h ++++ b/src/main/include/log4cxx/db/odbcappender.h +@@ -300,8 +300,10 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton + private: + ODBCAppender(const ODBCAppender&); + ODBCAppender& operator=(const ODBCAppender&); ++#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32) + static void encode(wchar_t** dest, const LogString& src, + log4cxx::helpers::Pool& p); ++#endif + static void encode(unsigned short** dest, const LogString& src, + log4cxx::helpers::Pool& p); + }; // class ODBCAppender