Gentoo Archives: gentoo-commits

From: Sven Wegener <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/osm2pgsql/files/, sci-geosciences/osm2pgsql/
Date: Fri, 19 Aug 2022 17:42:49
Message-Id: 1660930961.e74503ae2db7a39c8e8a1c6cbccf922ae663ff5e.swegener@gentoo
1 commit: e74503ae2db7a39c8e8a1c6cbccf922ae663ff5e
2 Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 19 17:36:01 2022 +0000
4 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 19 17:42:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74503ae
7
8 sci-geosciences/osm2pgsql: Update lua version patch for live ebuild
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
12
13 .../osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch | 11 +++++++++++
14 sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild | 2 +-
15 2 files changed, 12 insertions(+), 1 deletion(-)
16
17 diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
18 new file mode 100644
19 index 000000000000..054624d02d62
20 --- /dev/null
21 +++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
22 @@ -0,0 +1,11 @@
23 +--- a/CMakeLists.txt
24 ++++ b/CMakeLists.txt
25 +@@ -193,7 +193,7 @@
26 + add_definitions(-DHAVE_LUAJIT=1)
27 + else()
28 + message(STATUS "Building with Lua support")
29 +- find_package(Lua REQUIRED)
30 ++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
31 + include_directories(SYSTEM ${LUA_INCLUDE_DIR})
32 + endif()
33 + add_definitions(-DHAVE_LUA=1)
34
35 diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
36 index d9f18aee8602..767664197f02 100644
37 --- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
38 +++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
39 @@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
40 RESTRICT="test"
41
42 PATCHES=(
43 - "${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch
44 + "${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
45 )
46
47 src_configure() {