From patchwork Thu Apr 15 15:03:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1466676 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.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=knmt9iCc; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FLjHk42xyz9sVw for ; Fri, 16 Apr 2021 01:02:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B393340235; Thu, 15 Apr 2021 15:02:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Dcjf3IqHtuXI; Thu, 15 Apr 2021 15:02:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id F357640220; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 17C621BF86C for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 075ED40220 for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id geqCj2lE1JUT for ; Thu, 15 Apr 2021 15:02:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) by smtp2.osuosl.org (Postfix) with ESMTPS id 283364021B for ; Thu, 15 Apr 2021 15:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=Ss4a8qOTSIJkADl5frN+NhyU2oEX+6yth2HxNfsuz/4=; b=knmt9iCcLpciw2j9zVFhQZMTOax6CrQUZn9GLuDoHLm3Sb5G7F5FV3dQ5kJsTXxHpuYik2TI7NjINrPKqw3Owp+gKslLrC/lQlh0rmwQzg/1OgvhurxCkEuTlwiHTGsyZrFLDbhQjbNFSLxyZeVeH9+UNoC/Je9l+NezkA2OKFc=; Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1lX3VY-0000aH-DQ; Thu, 15 Apr 2021 18:02:16 +0300 To: buildroot@buildroot.org Date: Thu, 15 Apr 2021 18:03:54 +0300 Message-Id: <20210415150356.775904-1-fido_max@inbox.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Authentication-Results: smtp39.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480B1C8842CE613979723F2FB4628545A35182A05F5380850403AA820B3A4095557B7420E7A2C58E1123F28DE9DA295FCB853EF8F2C05A0FABA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A0175C48BD57B26BC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7C6A43EB42C8B28B9EA1F7E6F0F101C67CDEEF6D7F21E0D1D9295C2E9FA3191EE1B59CA4C82EFA658316C78C1CE1E420E91DB9C762936B1FDF6B57BC7E64490618DEB871D839B73339E8FC8737B5C22494854413538E1713FCC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0B27420F9988F54058941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD26923F8577A6DFFEA7CFF8F0A20C233E3717B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F437C869540D2AB0FB01F8B705E65F4D2B3661434B16C20AC78D18283394535A9E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6DEFAA5D9F874865875ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBF1196BB3248DD4B6DBF9887E5AC35C785682BD43EC0AC569C2B6934AE262D3EE7EAB7254005DCED864F6051C41E3F501E0A4E2319210D9B64D260DF9561598F01A9E91200F654B01098AAFFB0A1231D8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3453037B563866572197593030E4C88868A472D62545791D0D54459BC54B60FCDDF936A78FA3177C831D7E09C32AA3244C63438B4E8424B8DD36FA1653BA6DF29E3FD9C8CA1B0515E0FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDunQLImOLKR4yw== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB24D5580E72BD1199855326AF2274C8833B662C540C2CCA2F9DEE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH v3 1/3] package/protozero: new package 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: , From: Maxim Kochetkov via buildroot Reply-To: Maxim Kochetkov Cc: Maxim Kochetkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Minimalistic protocol buffer decoder and encoder in C++. Designed for high performance. Suitable for writing zero copy parsers and encoders with minimal need for run-time allocation of memory. Low-level: this is designed to be a building block for writing a very customized decoder for a stable protobuf schema. If your protobuf schema is changing frequently or lazy decoding is not critical for your application then this approach offers no value: just use the C++ API that can be generated with the Google Protobufs protoc program. https://github.com/mapbox/protozero Signed-off-by: Maxim Kochetkov --- DEVELOPERS | 1 + package/Config.in | 1 + package/protozero/Config.in | 20 ++++++++++++++++++++ package/protozero/protozero.hash | 4 ++++ package/protozero/protozero.mk | 17 +++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/protozero/Config.in create mode 100644 package/protozero/protozero.hash create mode 100644 package/protozero/protozero.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1348b8eb91..9390daa2fa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1840,6 +1840,7 @@ N: Max Filippov F: arch/Config.in.xtensa N: Maxim Kochetkov +F: package/protozero/ F: package/timescaledb/ N: Maxime Hadjinlian diff --git a/package/Config.in b/package/Config.in index ea0e9edc3e..c5014faba1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1966,6 +1966,7 @@ endif source "package/poco/Config.in" source "package/protobuf/Config.in" source "package/protobuf-c/Config.in" + source "package/protozero/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" source "package/riemann-c-client/Config.in" diff --git a/package/protozero/Config.in b/package/protozero/Config.in new file mode 100644 index 0000000000..f187840565 --- /dev/null +++ b/package/protozero/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_PROTOZERO + bool "protozero" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + help + Minimalistic protocol buffer decoder and encoder in C++. + Designed for high performance. Suitable for writing zero copy + parsers and encoders with minimal need for run-time allocation + of memory. + Low-level: this is designed to be a building block for writing + a very customized decoder for a stable protobuf schema. If your + protobuf schema is changing frequently or lazy decoding is not + critical for your application then this approach offers + no value: just use the C++ API that can be generated with + the Google Protobufs protoc program. + + https://github.com/mapbox/protozero + +comment "protozero needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/protozero/protozero.hash b/package/protozero/protozero.hash new file mode 100644 index 0000000000..5453e01ecf --- /dev/null +++ b/package/protozero/protozero.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 beffbdfab060854fd770178a8db9c028b5b6ee4a059a2fed82c46390a85f3f31 protozero-1.7.0.tar.gz +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE.md +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.from_folly diff --git a/package/protozero/protozero.mk b/package/protozero/protozero.mk new file mode 100644 index 0000000000..e4ce1a4730 --- /dev/null +++ b/package/protozero/protozero.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# protozero +# +################################################################################ + +PROTOZERO_VERSION = 1.7.0 +PROTOZERO_SITE = $(call github,mapbox,protozero,v$(PROTOZERO_VERSION)) +PROTOZERO_LICENSE = BSD-2-Clause, Apache-2.0 +PROTOZERO_LICENSE_FILES = LICENSE.md LICENSE.from_folly +PROTOZERO_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_PROTOBUF),y) +PROTOZERO_DEPENDENCIES += protobuf +endif + +$(eval $(cmake-package)) From patchwork Thu Apr 15 15:03:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1466677 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.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=YP/ZgOP5; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FLjHy4Vywz9sSC for ; Fri, 16 Apr 2021 01:02:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7991284709; Thu, 15 Apr 2021 15:02:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SxQhPjE-m21M; Thu, 15 Apr 2021 15:02:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id BC99B846FF; Thu, 15 Apr 2021 15:02:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EC6521BF86C for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E7D63606E2 for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=inbox.ru Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Wm1-GYGy5cx for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) by smtp3.osuosl.org (Postfix) with ESMTPS id CF9A660685 for ; Thu, 15 Apr 2021 15:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=drDvPsFEzcqEKdqEu+wpHp1TmQq2kNutTzoeAkVKTWc=; b=YP/ZgOP5heFxs8rl0cxRaDNEaTW5eN6PUdxvXlwPLivGzpKFsI83eTihmqBAjZjt+qK1WRbWdQnMfkJs1fWrUiJmJHyZTZFBQR/wVHsnu0Uuayp0zcYcwBVIb4HtU++cpC1fJWr2aaxTB0mHi8oqHeWvqxiZOuLhEC1MzWfAG9I=; Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1lX3Va-0000aH-G7; Thu, 15 Apr 2021 18:02:18 +0300 To: buildroot@buildroot.org Date: Thu, 15 Apr 2021 18:03:55 +0300 Message-Id: <20210415150356.775904-2-fido_max@inbox.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210415150356.775904-1-fido_max@inbox.ru> References: <20210415150356.775904-1-fido_max@inbox.ru> MIME-Version: 1.0 Authentication-Results: smtp39.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74809299FB6B3996B874F289A033C44AD400182A05F5380850404B606CD9400175D4EC370C42B61F98329721862BB274F8F43845C0FF5C7DBBFB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE782A779A89F7D69B2C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE70C5E0F71D77D667BEA1F7E6F0F101C67CDEEF6D7F21E0D1D9295C2E9FA3191EE1B59CA4C82EFA65859345E9F0FCDE7B98C55FECDC404CB7BF6B57BC7E64490618DEB871D839B73339E8FC8737B5C2249D082881546D93491CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C07E7E81EEA8A9722B8941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD26923F8577A6DFFEA7CF8CBA3D4DFAC81377B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F0AC5B80A05675ACD20DA3B6C150F7642B3661434B16C20AC78D18283394535A9E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6DEFAA5D9F874865875ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBF1196BB3248DD4BBBCB3F53ADDE595E481CAE569FC92BD49C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF46906D4753B15FC0699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D7D5115130EFC824700353AFBCADDEFAC1011FAA8E61B9F23FBCD0336DD355DA34245713BC76FADE1D7E09C32AA3244CAAA834ADE37B369899EC49E25E33B693F94338140B71B8EEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDumU2gdiy5Y1KA== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB24AA57C9AFD18A962C5326AF2274C8833BD48438AFE216C02EEE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH v3 2/3] package/libosmium: new package 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: , From: Maxim Kochetkov via buildroot Reply-To: Maxim Kochetkov Cc: Maxim Kochetkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" A fast and flexible C++ library for working with OpenStreetMap data. Libosmium works on Linux, macOS and Windows. https://osmcode.org/libosmium/ Signed-off-by: Maxim Kochetkov --- DEVELOPERS | 1 + package/Config.in | 1 + package/libosmium/Config.in | 17 +++++++++++++++++ package/libosmium/libosmium.hash | 3 +++ package/libosmium/libosmium.mk | 30 ++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 package/libosmium/Config.in create mode 100644 package/libosmium/libosmium.hash create mode 100644 package/libosmium/libosmium.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9390daa2fa..ceb7428e95 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1840,6 +1840,7 @@ N: Max Filippov F: arch/Config.in.xtensa N: Maxim Kochetkov +F: package/libosmium/ F: package/protozero/ F: package/timescaledb/ diff --git a/package/Config.in b/package/Config.in index c5014faba1..61c67e5ce1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1936,6 +1936,7 @@ menu "Other" source "package/libtasn1/Config.in" source "package/libtommath/Config.in" source "package/libtpl/Config.in" + source "package/libosmium/Config.in" source "package/libubox/Config.in" source "package/libuci/Config.in" source "package/libunwind/Config.in" diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in new file mode 100644 index 0000000000..e774dd0bd2 --- /dev/null +++ b/package/libosmium/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBOSMIUM + bool "libosmium" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST + + help + A fast and flexible C++ library for working with OpenStreetMap data. + Libosmium works on Linux, macOS and Windows. + + https://osmcode.org/libosmium/ + +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash new file mode 100644 index 0000000000..b90690e9aa --- /dev/null +++ b/package/libosmium/libosmium.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 42bbef97226d7db7ce3eeb474603e5b1f2f0f86cec85498868e9416e7cdf5bd5 libosmium-2.16.0.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk new file mode 100644 index 0000000000..1ef99e47fc --- /dev/null +++ b/package/libosmium/libosmium.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# libosmium +# +################################################################################ + +LIBOSMIUM_VERSION = 2.16.0 +LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) +LIBOSMIUM_LICENSE = BSL-1.0 +LIBOSMIUM_LICENSE_FILES = LICENSE +LIBOSMIUM_INSTALL_STAGING = YES +LIBOSMIUM_DEPENDENCIES = boost + +ifeq ($(BR2_PACKAGE_BZIP2),y) +LIBOSMIUM_DEPENDENCIES += bzip2 +endif + +ifeq ($(BR2_PACKAGE_LIBGEOS),y) +LIBOSMIUM_DEPENDENCIES += libgeos +endif + +ifeq ($(BR2_PACKAGE_LIBGDAL),y) +LIBOSMIUM_DEPENDENCIES += libgdal +endif + +ifeq ($(BR2_PACKAGE_PROJ),y) +LIBOSMIUM_DEPENDENCIES += proj +endif + +$(eval $(cmake-package)) From patchwork Thu Apr 15 15:03:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1466678 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=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=iOZgjdq0; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FLjJC1crQz9sVw for ; Fri, 16 Apr 2021 01:02:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 035E24021B; Thu, 15 Apr 2021 15:02:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nHhxhwLSaarR; Thu, 15 Apr 2021 15:02:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 2EF5340244; Thu, 15 Apr 2021 15:02:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 202121BF86C for ; Thu, 15 Apr 2021 15:02:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1CA9640237 for ; Thu, 15 Apr 2021 15:02:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DCq7lcmeWAfX for ; Thu, 15 Apr 2021 15:02:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2069340235 for ; Thu, 15 Apr 2021 15:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=OOJTjS0mfL9DnmB+mWNUIsEqmqS890OWKZ27GzXn7LM=; b=iOZgjdq0rGxakMwO6f52w6hi19veyZCYztyKGANGHNFNpZSTk1ZpzMvhuXNXy8KYL4vLtiaJ2eqXdjvdsPsbm+YwHe596Xxmb/i9X8+nEyWuh+eeSIP0hQqfwTXh7yRB3XS9MfZ0E18V3YnGJonVwHhV29io7QpJ3zVPIeesR/0=; Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1lX3Vb-0000aH-12; Thu, 15 Apr 2021 18:02:19 +0300 To: buildroot@buildroot.org Date: Thu, 15 Apr 2021 18:03:56 +0300 Message-Id: <20210415150356.775904-3-fido_max@inbox.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210415150356.775904-1-fido_max@inbox.ru> References: <20210415150356.775904-1-fido_max@inbox.ru> MIME-Version: 1.0 Authentication-Results: smtp39.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74807BAE725B9AE625DE765B0E193B5B7687182A05F53808504097F9AB62949B39FD2CF6C9B40CB8CA24583F3C8543318E9CE500390AB859712F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76042E2DB3E33BF2BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375045C080FAAE96148638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B26D6F852CC48722D97663012A34C92B50CB629EEF1311BF91D2E47CDBA5A96583C09775C1D3CA48CF27ED053E960B195E117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE74601F13E4625331C9FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE78719051F8CB453DDD32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C0259A6D7820E4F02ECD04E86FAF290E2D7E9C4E3C761E06A71DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3335407143AA9223635872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBF1196BB3248DD4B50BA05AEC121C88CB25ABA95944C3A8D9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF46906D4753B15FC0699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C2BE7381A0AD3DF144C86B4E5776FB891970B3BBDB2EEBFCFF3A05F63C7366FC7E4BD4E3E4EC9A361D7E09C32AA3244C28D5AB7AF9276A60219B84D7087906C397FE24653F78E668FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDukIF7V6Z/Zu8A== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB24BB6F22BFCB58654A5326AF2274C8833B87CA5D472DAE1081EE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH v3 3/3] package/osm2pgsql: new package 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: , From: Maxim Kochetkov via buildroot Reply-To: Maxim Kochetkov Cc: Maxim Kochetkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" osm2pgsql is a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis. https://osm2pgsql.org Signed-off-by: Maxim Kochetkov --- Changes v2 -> v3 (after review of Arnout Vandecappelle): - Move include to "if BR2_PACKAGE_POSTGRESQL" - Add comment about what's missing in the toolchain - Use unbundled version of libosmium and protozero Changes v1 -> v2 (after review of Peter Seiderer): - Add dependencies - Disable tests - Fix license - Fix check-package warnings - Add myself to DEVELOPERS - Test all lua versions (5.1, 5.3, 5.4) DEVELOPERS | 1 + package/Config.in | 3 +++ package/osm2pgsql/Config.in | 27 +++++++++++++++++++++++ package/osm2pgsql/osm2pgsql.hash | 3 +++ package/osm2pgsql/osm2pgsql.mk | 37 ++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+) create mode 100644 package/osm2pgsql/Config.in create mode 100644 package/osm2pgsql/osm2pgsql.hash create mode 100644 package/osm2pgsql/osm2pgsql.mk diff --git a/DEVELOPERS b/DEVELOPERS index ceb7428e95..7053c67b6c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1841,6 +1841,7 @@ F: arch/Config.in.xtensa N: Maxim Kochetkov F: package/libosmium/ +F: package/osm2pgsql/ F: package/protozero/ F: package/timescaledb/ diff --git a/package/Config.in b/package/Config.in index 61c67e5ce1..00f639915f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1407,6 +1407,9 @@ menu "Database" source "package/mongodb/Config.in" source "package/mysql/Config.in" source "package/postgresql/Config.in" +if BR2_PACKAGE_POSTGRESQL + source "package/osm2pgsql/Config.in" +endif if BR2_PACKAGE_POSTGRESQL_FULL source "package/postgis/Config.in" endif diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in new file mode 100644 index 0000000000..e4163b5e66 --- /dev/null +++ b/package/osm2pgsql/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OSM2PGSQL + bool "osm2pgsql" + depends on BR2_PACKAGE_POSTGRESQL + depends on BR2_INSTALL_LIBSTDCPP # boost, fmt + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost, fmt + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FMT + select BR2_PACKAGE_PROTOZERO + select BR2_PACKAGE_LIBOSMIUM + select BR2_PACKAGE_ZLIB + help + osm2pgsql is a tool for loading OpenStreetMap data into a + PostgreSQL / PostGIS database suitable for applications like + rendering into a map, geocoding with Nominatim, + or general analysis. + + https://osm2pgsql.org + +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS \ No newline at end of file diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash new file mode 100644 index 0000000000..13e8de4b51 --- /dev/null +++ b/package/osm2pgsql/osm2pgsql.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 fc68283930ccd468ed9b28685150741b16083fec86800a4b011884ae22eb061c osm2pgsql-1.4.2.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk new file mode 100644 index 0000000000..f331955604 --- /dev/null +++ b/package/osm2pgsql/osm2pgsql.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# osm2pgsql +# +################################################################################ + +OSM2PGSQL_VERSION = 1.4.2 +OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) +OSM2PGSQL_LICENSE = GPL-2.0+ +OSM2PGSQL_LICENSE_FILES = COPYING +OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO + +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib + +OSM2PGSQL_CONF_OPTS += -DBUILD_TESTS=OFF -DBUILD_COVERAGE=OFF +OSM2PGSQL_CONF_OPTS += -DEXTERNAL_FMT=ON -DEXTERNAL_LIBOSMIUM=ON -DEXTERNAL_PROTOZERO=ON + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +OSM2PGSQL_DEPENDENCIES += luajit +OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=ON +else +ifeq ($(BR2_PACKAGE_LUA),y) +OSM2PGSQL_DEPENDENCIES += lua +OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=OFF +else +OSM2PGSQL_CONF_OPTS += -DWITH_LUA=OFF -DWITH_LUAJIT=OFF +endif +endif + +ifeq ($(BR2_PACKAGE_PROJ),y) +OSM2PGSQL_DEPENDENCIES += proj +OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=auto +else +OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=off +endif + +$(eval $(cmake-package))