From nobody Fri Dec 23 18:43:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ndx084GyNz1HNN1; Fri, 23 Dec 2022 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ndx083k5nz3Jdd; Fri, 23 Dec 2022 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671821016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jk0NSlVVmn087AIslMr/n5mw56tTNOu9JYjDxHy8n8A=; b=ozYsxloD8hZHTIR96XK9amhpSrTgoS/L5+h/TgFFpe93dpJPnkOFX+mH2MkSXwQYexkLBs 8lAspKPgY4bgyndX+hV8/qOmDQNNDOFrD6g5Yo1pn5hjKNutKDtkDsnfrMuLLWDu5k83CB ln/nMB1dJ0Vf6JmBIXO2rzKhtqXESjNatHP0fVfYFytdGKE2XJBFWdBrvFIP7Pf3NTskPU Lw9fG8C/7cnsYcEMSx17rKI2ORavzEf7NnCXL+cmTjrIVEPQxJtL7dsI2ZluGJjPQMa9+j DYiPHlWbyVdbT/qQzxSh6F4YLDi2mQklGLf8j/9iUKFquGqYvOhabMOQfkjk/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671821016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jk0NSlVVmn087AIslMr/n5mw56tTNOu9JYjDxHy8n8A=; b=lnwllXP9y0w1KQ/hi7JoSTwkAvmGcz9a7GbRWcaX7Od0x0Q+2dSElNESB1MiZsv6hOXYyd wRFVf6lZ/Sm2CdKegcGRGTARyajLs69JMsajijMqYNQJ5tyup/myciPaVbswyXI5027aoN BQr8bhH45o5Z4bTSz8XpILomHQdzgmNCs/AqruYwogwNzrromMYUqUMQb9LzyF2dhYdOqP Kz5IJrPSaCkeYM2jpW0Kdqw1Po3iRe4aseNZRl3koTpNX0HUL1dXQFJzvUfQxDtpuXopOV iv0PfYCvhmir/WLccrbZouSGHUSk+bewLa6A5lxav46D3Uw2l/hTl1OAf+dsWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671821016; a=rsa-sha256; cv=none; b=iHTFn0cTvoqJeJl2NwgBdIez058Ra+pTIH71XZljeF9X0zK8vZEyNY2Sivj6nKoZwYepn5 oCyODN1furh6OStU80gjvmF0TBaI8wUnDvmEsPusQO7WJ4Tm07mhw4ksHbQSIkwtFraL5q 5xyZcBKbow3SBGFFS8ZiRV/ghKNSAl7TapDMewlqeJ24Pma4E+xkDahvskMu4Wx+8dDBaF KdJprqDEJppVpFiEpP3IrN8ZT3hv05sebPfNGYRYOPSiHz9IHsTp90YQt5gOkfguDI1K/s prZj1sMhyNu/PYedPCAsmCjhtRRnL3i+C5PoUvrZqPQx1L1S0Bl4Vk5qU0PYuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ndx082nKvzkP8; Fri, 23 Dec 2022 18:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BNIharg098104; Fri, 23 Dec 2022 18:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BNIharn098103; Fri, 23 Dec 2022 18:43:36 GMT (envelope-from git) Date: Fri, 23 Dec 2022 18:43:36 GMT Message-Id: <202212231843.2BNIharn098103@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 6d99ee848957 - main - converters/osm2pgsql: fix build after libfmt update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d99ee8489575c90f0711189410eb21aa0cc5e76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d99ee8489575c90f0711189410eb21aa0cc5e76 commit 6d99ee8489575c90f0711189410eb21aa0cc5e76 Author: Dmitry Marakasov AuthorDate: 2022-12-23 18:43:22 +0000 Commit: Dmitry Marakasov CommitDate: 2022-12-23 18:43:22 +0000 converters/osm2pgsql: fix build after libfmt update --- converters/osm2pgsql/Makefile | 5 ++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index c237fcb0270f..ecb6cf1314c7 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= libproj.so:graphics/proj \ libexpat.so:textproc/expat2 BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ - ${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson \ - ${LOCALBASE}/include/fmt/core.h:devel/libfmt + ${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson USE_GITHUB= yes GH_ACCOUNT= openstreetmap @@ -28,8 +27,8 @@ SHEBANG_FILES= scripts/osm2pgsql-replication CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ EXTERNAL_LIBOSMIUM \ EXTERNAL_PROTOZERO \ - EXTERNAL_FMT \ EXTERNAL_RAPIDJSON +# EXTERNAL_FMT # XXX: does not build with libfmt 9.x from ports, so use bundled version until upstream fixes CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d94e7ed7a4b7 --- /dev/null +++ b/converters/osm2pgsql/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2022-11-10 19:15:49 UTC ++++ CMakeLists.txt +@@ -173,7 +173,7 @@ if (NOT EXTERNAL_PROTOZERO) + endif() + + if (NOT EXTERNAL_FMT) +- set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include") ++ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include") + endif() + + if (NOT EXTERNAL_RAPIDJSON) +@@ -183,7 +183,7 @@ endif() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}) + + find_package(Osmium 2.17.3 REQUIRED COMPONENTS io) +-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}) ++include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}) + + if (WITH_LUA) + if (WITH_LUAJIT)