CVS commit: pkgsrc/chat/weechat

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Feb 24 09:55:40 UTC 2022

Modified Files:
        pkgsrc/chat/weechat: distinfo
Added Files:
        pkgsrc/chat/weechat/patches: patch-src_plugins_ruby_CMakeLists.txt

Log Message:
weechat: Use correct RUBY_LIBRARIES variable.

Fixes build on Darwin/arm64 where RUBY_LDFLAGS contains '-arch arm64' which
was being mangled to '-arch -larm64'.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/chat/weechat/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/weechat/distinfo
diff -u pkgsrc/chat/weechat/distinfo:1.72 pkgsrc/chat/weechat/distinfo:1.73
--- pkgsrc/chat/weechat/distinfo:1.72   Sun Dec 19 13:22:21 2021
+++ pkgsrc/chat/weechat/distinfo        Thu Feb 24 09:55:40 2022
@@ -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) = 7
 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

Added files:

Index: pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt
diff -u /dev/null pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt:1.1
--- /dev/null   Thu Feb 24 09:55:40 2022
+++ pkgsrc/chat/weechat/patches/patch-src_plugins_ruby_CMakeLists.txt   Thu Feb 24 09:55:40 2022
@@ -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)