From patchwork Mon Jun 1 09:54:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1301677 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=tnP+VKbc; 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 49b9Tk6X97z9sTT for ; Mon, 1 Jun 2020 19:53:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 283CE227CD; Mon, 1 Jun 2020 09:53:12 +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 dE1FokRHfO4x; Mon, 1 Jun 2020 09:53:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 64EFE228EB; Mon, 1 Jun 2020 09:53:10 +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 E4E601BF40B for ; Mon, 1 Jun 2020 09:53:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E033787C66 for ; Mon, 1 Jun 2020 09:53:08 +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 FUHtE1PrBBXI for ; Mon, 1 Jun 2020 09:53:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 11EB087C6B for ; Mon, 1 Jun 2020 09:53:08 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id j10so10802677wrw.8 for ; Mon, 01 Jun 2020 02:53:07 -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=t2uvRZTwotfB0cH2O+n0Ihs8t0a0DpbmXhM1dEyNYOk=; b=tnP+VKbcH3e66wcLhfc/NIxSKQyOurvhgzPIZ3PBbHZBa5T3OFFthCMKKakiqndw/e /cHXttU//q+f72LlgZC7yMhpMg+z5tRwfn4NPcb2SyhjECg6IZwszab1pLt0U0BffLzZ iGCuytq1JtNvBN62s/hVC7b/51za3TbZQnbVEh2nQCtRVigk5Dj8GQ4HwW+0DYckiL4u sfLPXmRz3M4oHhKMiCvTRJHXULKUM9JPGh2fjdB7NaFa1tQ2yTDlMnpLvfN3YZPK/EZ3 ytbhNtlTP2TSNS1INLWmZ5U9phD9iKd3/XAQiD2UHazSZLDDjZ9wk+QqzFGqdFzI8h5Z YeNA== 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=t2uvRZTwotfB0cH2O+n0Ihs8t0a0DpbmXhM1dEyNYOk=; b=eo9IUgf+46yrXuxmwtMOSwtmoKJJI8w/qOeyN6LJ0UEPob1JgRFE+vaHi+l/jU3/Qf y6ikR0T7ddy1ydf4DSF1DqgfdAfqUpH328WCJG7r9cbTM8RpIB1J7sj+7rpdMYXuh0CF orqCmInyvv/f9d5yveYpSdGRqdP3pIWZNsRtdoinfEFZP5UjqMqP0Tjt9pYgkOzmO80Q MvpltKzlAQ4jLuLVgi5TySXIlSse4uMoIK76J+mgmfMoZn154pMZWXlC/4tN3zdsYLls FT3gb5naesmiqn+nl6H0jrEczlyBl+WGdxV1L99MZYWLZmQyTdXyo0k1g/ISeXWQCSPG 4JeQ== X-Gm-Message-State: AOAM531sEjI/uITIx98/ndQCe4ze8x41ey26+Ivfe5RsBt+zB5Si6nmL TZ03+qam05h9f0vEryYsZbNkt3JQ X-Google-Smtp-Source: ABdhPJygibtaBgx6BkxIt7gdAHwtLoht9svHHBMcri/9W76sE8y03wm5mnuecPtbRmwhZwP+IyfDOA== X-Received: by 2002:adf:d84c:: with SMTP id k12mr21020548wrl.265.1591005185813; Mon, 01 Jun 2020 02:53:05 -0700 (PDT) Received: from kali.home (lfbn-ren-1-2144-158.w92-167.abo.wanadoo.fr. [92.167.223.158]) by smtp.gmail.com with ESMTPSA id d2sm19764654wrs.95.2020.06.01.02.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 02:53:05 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 1 Jun 2020 11:54:32 +0200 Message-Id: <20200601095432.1108102-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/wampcc fix build with musl 1.2.0 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 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/da996e189220499b85efbdb541a891ac18db38c6 Signed-off-by: Fabrice Fontaine --- ...platform.h-fix-build-with-musl-1.2.0.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch diff --git a/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch b/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch new file mode 100644 index 0000000000..c7b8c78602 --- /dev/null +++ b/package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch @@ -0,0 +1,38 @@ +From 9c2559434b752df3dc8460ee242d321670a40847 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 1 Jun 2020 11:41:54 +0200 +Subject: [PATCH] include/wampcc/platform.h: fix build with musl 1.2.0 + +Fix the following build failure on musl 1.2.0 due to time_t being on 64 +bits: + +/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc: In function 'std::__cxx11::string wampcc::local_timestamp()': +/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc:205:15: error: cannot convert 'wampcc::time_val::type_type*' {aka 'long int*'} to 'const time_t*' {aka 'const long long int*'} + localtime_r(&now.sec, &parts); + ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/da996e189220499b85efbdb541a891ac18db38c6 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/darrenjs/wampcc/pull/62] +--- + include/wampcc/platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/wampcc/platform.h b/include/wampcc/platform.h +index 24d0868..aebf950 100644 +--- a/include/wampcc/platform.h ++++ b/include/wampcc/platform.h +@@ -27,7 +27,7 @@ namespace wampcc + struct time_val + { + #ifndef _WIN32 +- typedef long type_type; ++ typedef time_t type_type; + #else + typedef __time64_t type_type; + #endif +-- +2.26.2 +