From patchwork Wed Apr 28 04:12:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1470967 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=OA/ej9fW; 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 4FVQCz70cdz9sW8 for ; Wed, 28 Apr 2021 14:10:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9B22660BBB; Wed, 28 Apr 2021 04:10:52 +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 dP2qmBCYBcVo; Wed, 28 Apr 2021 04:10:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D557760BB5; Wed, 28 Apr 2021 04:10:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2120C1BF869 for ; Wed, 28 Apr 2021 04:10:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1092F406A4 for ; Wed, 28 Apr 2021 04:10:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=inbox.ru Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OBFWiPT0FDL3 for ; Wed, 28 Apr 2021 04:10:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) by smtp4.osuosl.org (Postfix) with ESMTPS id E6256406A0 for ; Wed, 28 Apr 2021 04:10:37 +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=WQhM+25KogRp+i4STpNx5w5NoQuGJaJNUCOHnWoza9w=; b=OA/ej9fWWK7ly3VEQR6ErThIe+g6UduMZmAldqze7IzXGC1RHvqsmUoOwwtYLUkqQ7Pfn4VseMApHic/W8Tp9OJBDSwgvy2WFm3PuvBqeA0PZlLFlxffD2yJC+zL8wUZAaxeNRcnfbUsvbUOku3oJHpvwBBlwwWEZqGETtNEm/A=; Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1lbbX0-0006Rg-6l; Wed, 28 Apr 2021 07:10:34 +0300 To: buildroot@buildroot.org Date: Wed, 28 Apr 2021 07:12:15 +0300 Message-Id: <20210428041216.22955-2-fido_max@inbox.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210428041216.22955-1-fido_max@inbox.ru> References: <20210428041216.22955-1-fido_max@inbox.ru> MIME-Version: 1.0 Authentication-Results: smtp61.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9ECFD8CE5F0594010C798B26A9CF6FD3F2B2BC7AAFDCADAFC182A05F53808504054F48B6CB6B2F7E11B62C5EC613D59DD1BEF661D8E7445F33C93FFE52ED6C1A5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78981306C6E927004EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CDA1F22AAA442F218638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2E21DA2645FB8DF8EC156B42FB224CC30E2F41FD49071CA2BD2E47CDBA5A96583C09775C1D3CA48CFCF36E64A7E3F8E58117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE74601F13E4625331C9FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE73177526CD55AFC117B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F140C956E756FBB7A500AC0B2F9B62304B3661434B16C20AC78D18283394535A9E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B851EDB9C5A93305EEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C97831A0312A9B31EF9E867EE597FE6297188A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C8E0B2E50BE5001AC3A233A88F393DD78B88A849478ABE50A9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF46906D4753B15FC0699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3435BBF0AC4E3A921C5CC97FC775611EB5267F58A7B323CB877C3C78B78C159508961E800F19BF11641D7E09C32AA3244C4A0113AE69E44F3A8D64ADB95A5927E9250262A5EE9971B0FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmGF4M/OAxzeUOsI7mJDwUg== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB24427735AE654284C078300EAA48777EC09C6B1C9ACA2D5C7DEE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH v5 2/2] 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 --- DEVELOPERS | 1 + package/Config.in | 1 + package/osm2pgsql/Config.in | 27 ++++++++++++++++++++++++ package/osm2pgsql/osm2pgsql.hash | 3 +++ package/osm2pgsql/osm2pgsql.mk | 35 ++++++++++++++++++++++++++++++++ 5 files changed, 67 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 c334c2c093..be73011e4d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1843,6 +1843,7 @@ F: arch/Config.in.xtensa N: Maxim Kochetkov F: package/libosmium/ +F: package/osm2pgsql/ F: package/postgis/ F: package/protozero/ F: package/timescaledb/ diff --git a/package/Config.in b/package/Config.in index 001beaa0cf..b000b8c700 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1410,6 +1410,7 @@ menu "Database" source "package/mysql/Config.in" source "package/postgresql/Config.in" if BR2_PACKAGE_POSTGRESQL + source "package/osm2pgsql/Config.in" source "package/postgis/Config.in" endif source "package/redis/Config.in" diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in new file mode 100644 index 0000000000..38810c1350 --- /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_LIBOSMIUM + select BR2_PACKAGE_PROTOZERO + 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 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..caa6989b3b --- /dev/null +++ b/package/osm2pgsql/osm2pgsql.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# 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 + +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))