diff options
| author | tnn <tnn@pkgsrc.org> | 2020-08-18 03:27:49 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-08-18 03:27:49 +0000 |
| commit | 6316e0126b5188639ba4c07c17898afe28068fd4 (patch) | |
| tree | 21b4b654da4385d320eb799c043fd8bf64a48189 | |
| parent | 699c4a960efb5277486c16cb34ff6821546b99c0 (diff) | |
| download | pkgsrc-6316e0126b5188639ba4c07c17898afe28068fd4.tar.gz | |
openttd: use pkg-config to find liblzo2
| -rw-r--r-- | games/openttd/distinfo | 4 | ||||
| -rw-r--r-- | games/openttd/patches/patch-config.lib | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/games/openttd/distinfo b/games/openttd/distinfo index c39b4f09b84..212c1b794a9 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.35 2020/06/03 16:52:39 nia Exp $ +$NetBSD: distinfo,v 1.36 2020/08/18 03:27:49 tnn Exp $ SHA1 (openttd-1.10.2-source.tar.xz) = a7f56648b974b3f088e44362a7fe9d53721b5ecc RMD160 (openttd-1.10.2-source.tar.xz) = a821312b74f7328e367fa765b59ec228d8ebfb7d SHA512 (openttd-1.10.2-source.tar.xz) = 03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683 Size (openttd-1.10.2-source.tar.xz) = 6766904 bytes -SHA1 (patch-config.lib) = 297caf33c50298a4efcbddbe3fea88e2b4f101c1 +SHA1 (patch-config.lib) = 1e8319816aba9d7bf4d0f749c0a4725d1747388a SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1 SHA1 (patch-src_core_endian__type.hpp) = 23564a89fd0e2ebe97043c7d16d5831831b65f40 diff --git a/games/openttd/patches/patch-config.lib b/games/openttd/patches/patch-config.lib index 0c1579e7571..60d17362ed8 100644 --- a/games/openttd/patches/patch-config.lib +++ b/games/openttd/patches/patch-config.lib @@ -1,12 +1,13 @@ -$NetBSD: patch-config.lib,v 1.2 2019/04/25 15:55:07 adam Exp $ +$NetBSD: patch-config.lib,v 1.3 2020/08/18 03:27:49 tnn Exp $ Compile 'strip' test with CFLAGS, so -isysroot can be passed on OSX. Correct library detection on NetBSD. On Darwin, be able to locate iconv.h inside the SDK. +Use pkg-config to detect liblzo2 as hand-crafted method seems unreliable. ---- config.lib.orig 2019-04-08 19:42:35.000000000 +0000 +--- config.lib.orig 2020-06-01 21:22:01.000000000 +0000 +++ config.lib -@@ -2140,7 +2140,7 @@ check_strip() { +@@ -2088,7 +2088,7 @@ check_strip() { elif [ "$os" = "OSX" ]; then # Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something echo "int main(int argc, char *argv[]) { }" > strip.test.c @@ -15,7 +16,7 @@ On Darwin, be able to locate iconv.h inside the SDK. check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test" rm -f strip.test.c strip.test else -@@ -2676,7 +2676,7 @@ detect_library() { +@@ -2633,7 +2633,7 @@ detect_library() { if [ -z "$res" ]; then log 2 " trying /opt/local/include/$4$5... no" fi @@ -24,7 +25,16 @@ On Darwin, be able to locate iconv.h inside the SDK. eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" eval "res=\$$2" if [ -z "$res" ]; then -@@ -2926,6 +2926,9 @@ detect_iconv() { +@@ -2725,7 +2725,7 @@ detect_zlib() { + } + + detect_lzo2() { +- detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h" ++ detect_pkg_config "$with_lzo2" "lzo2" "lzo2" "2.10" + } + + detect_fluidsynth() { +@@ -2885,6 +2885,9 @@ detect_iconv() { break fi done |