From patchwork Tue Apr 13 13:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1465808 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::136; helo=smtp3.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=pto8AJlf; dkim=fail reason="signature verification failed" (1024-bit key) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=Pq5CO5D4; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4FKSqh4bdpz9sRf for ; Wed, 14 Apr 2021 00:37:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3BC5660BC3; Tue, 13 Apr 2021 14:37:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 BT8sfpwB10ue; Tue, 13 Apr 2021 14:37:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 647C460B94; Tue, 13 Apr 2021 14:37:16 +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 765031BF370 for ; Tue, 13 Apr 2021 14:37:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 65AA260B94 for ; Tue, 13 Apr 2021 14:37:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 YTAeOwrOixdJ for ; Tue, 13 Apr 2021 14:37:12 +0000 (UTC) X-Greylist: delayed 00:47:22 by SQLgrey-1.8.0 Received: from fallback25.mail.ru (fallback25.m.smailru.net [94.100.189.1]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5E35D6079F for ; Tue, 13 Apr 2021 14:37:11 +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; bh=Jsr189UeHaYkGkJIzI/9TGSuT8G2comFGC0tNcikWN8=; b=pto8AJlfA5ucdiRe+cTS0kif6mNpLcAZ3C2uY6aFewmkfjcwW4bFCkWRjAi1uiILRDqZY5ed0INtYzWS6sb02EnBFRXwcPsH/5l6o38cI01C72f4Qg0D2F1a0eCNDG+cTcjLMFfZ/ERiP+cW5DDyJfUb4VMKpVBlbiakcr8LZR8=; Received: from [10.161.25.35] (port=35882 helo=smtp58.i.mail.ru) by fallback25.m.smailru.net with esmtp (envelope-from ) id 1lWJQJ-0005ub-Lc for buildroot@buildroot.org; Tue, 13 Apr 2021 16:49:47 +0300 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=Jsr189UeHaYkGkJIzI/9TGSuT8G2comFGC0tNcikWN8=; b=Pq5CO5D4KlKx7TdTwsCUkxbfYLcMuMelyT2TxpMKc8UdI1vc1qi045v1y51csYcKNvacFJcipIwvl+k8U2v9TNRJh/zMNSVP5jXoQ/1IStAk3Oyk/uk/s9o6Zs/7e98oYQBK07+ZMozsuahpS/GcIxXdEznAQ37ZNVgYQV3+HSc=; Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1lWJQA-0007DY-IX; Tue, 13 Apr 2021 16:49:38 +0300 To: buildroot@buildroot.org Date: Tue, 13 Apr 2021 16:51:20 +0300 Message-Id: <20210413135120.3724605-1-fido_max@inbox.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74807BAE725B9AE625DE765B0E193B5B7687182A05F538085040FF4C85C95E03BD24D88491F4E9D89075024508E914A1666A6F94E292E00D1531 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CE54A8686262D0D1EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AAF0FBE7E77B7ED78638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B270AC9C2F56272C12E161044C3DBBA05344A6ACC89FD899E7D2E47CDBA5A96583C09775C1D3CA48CFED8438A78DFE0A9E117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE78A0F7C24A37A3D769FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE7494AAEFF9D85BA3DD32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C04782AAF36435267CB3661434B16C20AC78D18283394535A9E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB69F9342289A40B3E314899263AE6FBCCBA21241D4466B1C9C2B6934AE262D3EE7EAB7254005DCED864F6051C41E3F501E0A4E2319210D9B64D260DF9561598F01A9E91200F654B069F8FEF10F1C2C2993EDB24507CE13387DFF0A840B692CF8 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3488E5CD2E691F5566A63D2D792FE0825C59F3450D660422C4E84BD4D799D89E1E5596B015392806A61D7E09C32AA3244C8D03F37BDC7EA7346AD23AD6027F43F730452B15D76AEC14FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnA7/qPBUIXEpyUIM5bkS9A== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB2440BC0F2A8A833D70664A5265A248433664D1AAD6AE5DFCABEE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok X-7564579A: 646B95376F6C166E X-77F55803: 6242723A09DB00B4F462559CB183475CD50668BED91BC476B9639C7DDA502039049FFFDB7839CE9ED86747652A85E6D901943F77856F00A13C8A58C62EAB40853BD3B2E5B91AF76B X-7FA49CB5: 0D63561A33F958A5C07E0E1D950A33F2FD2D1FAA5DF9710773F930E0B05CF0228941B15DA834481FA18204E546F3947CA0BCD6C998BE2772F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637816184856DB9DCB1389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F79006377263CA0F14EBD909D81D268191BDAD3DBD4B6F7A4D31EC0BEA7A3FFF5B025636AAAE862A0553A39223F8577A6DFFEA7CAD67A113071E75DA43847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB69F9342289A40B31957E53542A85884693507C09E97A0319C2B6934AE262D3EE7EAB7254005DCED864F6051C41E3F50699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnA7/qPBUIXElLhnmmibcFg== X-Mailru-MI: 800 X-Mailru-Sender: A5480F10D64C9005C4B9C964EF46FD64B76976B2DA07175BF5871D83C579E1A3398300F31D255910C099ADC76E806A99D50E20E2BC48EF5A30D242760C51EA9CEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: [Buildroot] [PATCH v2 1/1] 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 , ps.report@gmx.net 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 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 | 1 + package/osm2pgsql/Config.in | 20 ++++++++++++ package/osm2pgsql/osm2pgsql.hash | 3 ++ package/osm2pgsql/osm2pgsql.mk | 54 ++++++++++++++++++++++++++++++++ 5 files changed, 79 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 7699c471d3..e94c4291f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1837,6 +1837,7 @@ F: arch/Config.in.xtensa N: Maxim Kochetkov F: package/timescaledb/ +F: package/osm2pgsql/ N: Maxime Hadjinlian F: package/babeld/ diff --git a/package/Config.in b/package/Config.in index 19f2606b6b..1615f0c7e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1405,6 +1405,7 @@ menu "Database" source "package/libpqxx/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" + source "package/osm2pgsql/Config.in" source "package/postgresql/Config.in" if BR2_PACKAGE_POSTGRESQL_FULL source "package/postgis/Config.in" diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in new file mode 100644 index 0000000000..69ae4b4232 --- /dev/null +++ b/package/osm2pgsql/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_OSM2PGSQL + bool "osm2pgsql" + depends on BR2_PACKAGE_POSTGRESQL + depends on BR2_INSTALL_LIBSTDCPP # boost + 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 + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_EXPAT + 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 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..f281a18b6b --- /dev/null +++ b/package/osm2pgsql/osm2pgsql.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# osm2pgsql +# +################################################################################ + +OSM2PGSQL_VERSION = 1.4.2 +OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) +OSM2PGSQL_LICENSE = GPL-2.0+, BSL-1.0 (libosmium), Apache-2.0 (protozero), BSD-2-Clause (protozero), MIT with exception (fmt) +OSM2PGSQL_LICENSE_FILES = COPYING +OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO + +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat postgresql zlib + +#disable build and coverage tests +OSM2PGSQL_CONF_OPTS += -DBUILD_TESTS=OFF -DBUILD_COVERAGE=OFF + +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_FMT),y) +OSM2PGSQL_DEPENDENCIES += fmt +OSM2PGSQL_CONF_OPTS += -DEXTERNAL_FMT=ON +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 + +#not in buildroot now +ifeq ($(BR2_PACKAGE_LIBOSMIUM),y) +OSM2PGSQL_DEPENDENCIES += libosmium +OSM2PGSQL_CONF_OPTS += -DEXTERNAL_LIBOSMIUM=ON +endif + +#not in buildroot now +ifeq ($(BR2_PACKAGE_PROTOZERO),y) +OSM2PGSQL_DEPENDENCIES += protozero +OSM2PGSQL_CONF_OPTS += -DEXTERNAL_PROTOZERO=ON +endif + +$(eval $(cmake-package))