diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-02-24 09:55:40 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-02-24 09:55:40 +0000 |
| commit | 4a6d829924c8a18553be8da6eb9af634f9635cc7 (patch) | |
| tree | 569fa427f448155a2fd45cb9bf4fa8933ac85e3c | |
| parent | ea7a95a7743fbc75e8d0071b74c238f390d54717 (diff) | |
| download | pkgsrc-4a6d829924c8a18553be8da6eb9af634f9635cc7.tar.gz | |
weechat: Use correct RUBY_LIBRARIES variable.
Fixes build on Darwin/arm64 where RUBY_LDFLAGS contains '-arch arm64' which
was being mangled to '-arch -larm64'.
| -rw-r--r-- | chat/weechat/distinfo | 3 | ||||
| -rw-r--r-- | chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo index 4e4007b8cff..64599c59655 100644 --- a/chat/weechat/distinfo +++ b/chat/weechat/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2021/12/19 13:22:21 nia Exp $ +$NetBSD: distinfo,v 1.73 2022/02/24 09:55:40 jperkin Exp $ BLAKE2s (weechat-3.4.tar.xz) = e7abac6e913787bfda4aa9637c7741f588529e0d9dff4b2b3ea5a99790b12d3b SHA512 (weechat-3.4.tar.xz) = b5e36802bb8b8f0e518da590d675ca63b0fa0b88acd24c2803d4f8468e6bce775691d3994db5090570f1286ad38be31615921b0d3ead697ad51986cddca57330 @@ -7,3 +7,4 @@ SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4 SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068 SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541 SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341 +SHA1 (patch-src_plugins_ruby_CMakeLists.txt) = 84e7e348985fe047ac80884ad4a4a9b32066d733 diff --git a/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt b/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt new file mode 100644 index 00000000000..e0c83b534c1 --- /dev/null +++ b/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-src_plugins_ruby_CMakeLists.txt,v 1.1 2022/02/24 09:55:40 jperkin Exp $ + +RUBY_LDFLAGS may contain strings unsuitable for target_link_libraries(), for +example "-arch arm64" will get converted to "-arch -larm64". + +--- src/plugins/ruby/CMakeLists.txt.orig 2021-12-18 07:57:32.000000000 +0000 ++++ src/plugins/ruby/CMakeLists.txt +@@ -25,7 +25,7 @@ set_target_properties(ruby PROPERTIES PR + + if(RUBY_FOUND) + include_directories(${RUBY_INCLUDE_DIRS}) +- target_link_libraries(ruby ${RUBY_LDFLAGS} weechat_plugins_scripts coverage_config) ++ target_link_libraries(ruby ${RUBY_LIBRARIES} weechat_plugins_scripts coverage_config) + endif(RUBY_FOUND) + + install(TARGETS ruby LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) |