Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=98ee6b586326d59a5da8bd092936e7046b1738f3
commit 98ee6b586326d59a5da8bd092936e7046b1738f3 Author: crazy <[email protected]> Date: Mon Jul 24 17:00:30 2017 +0200 weechat-1.9-2-x86_64 * force python module to link to libutil && use no-as-needed for it * fixes issue reported by Nekrodes: -> /usr/lib/weechat/plugins/python.so: undefined symbol: forkpty * while at it fix verbose stuff.. weechat folks forces it to be OFF but we want it to be set from cmake options like it should diff --git a/source/network-extra/weechat/FrugalBuild b/source/network-extra/weechat/FrugalBuild index a5f4828..9a382f2 100644 --- a/source/network-extra/weechat/FrugalBuild +++ b/source/network-extra/weechat/FrugalBuild @@ -3,7 +3,7 @@ pkgname=weechat pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light & extensible IRC client." url="http://www.weechat.org"; depends=('gnutls' 'libgcrypt' 'curl' 'ncurses>=6.0-12') @@ -13,12 +13,17 @@ groups=('network-extra') archs=('x86_64') up2date=("Flasttar ${url}/files/src/") _F_gnome_iconcache="y" -source=(${url}/files/src/$pkgname-$pkgver.tar.gz) +source=(${url}/files/src/$pkgname-$pkgver.tar.gz \ + force-python-module-link-with-libutil-and-no-as-needed.patch) Finclude cmake -sha1sums=('90fb06cd739371ff722823b2c57f35171c1a6d87') +sha1sums=('90fb06cd739371ff722823b2c57f35171c1a6d87' \ + 'b7f2d088f8d5572d8288d7035231a52f518e8659') build() { Fcd + Fsed 'set(CMAKE_VERBOSE_MAKEFILE OFF)' '#set(CMAKE_VERBOSE_MAKEFILE OFF)' CMakeLists.txt CMake_build Frm /usr/share/icons/ } + +# optimization OK diff --git a/source/network-extra/weechat/force-python-module-link-with-libutil-and-no-as-needed.patch b/source/network-extra/weechat/force-python-module-link-with-libutil-and-no-as-needed.patch new file mode 100644 index 0000000..7f2b4ec --- /dev/null +++ b/source/network-extra/weechat/force-python-module-link-with-libutil-and-no-as-needed.patch @@ -0,0 +1,14 @@ +diff -Naur weechat-1.9/src/plugins/python/CMakeLists.txt weechat-1.9-p/src/plugins/python/CMakeLists.txt +--- weechat-1.9/src/plugins/python/CMakeLists.txt 2017-06-25 10:20:52.000000000 +0200 ++++ weechat-1.9-p/src/plugins/python/CMakeLists.txt 2017-07-24 15:58:51.811594269 +0200 +@@ -24,8 +24,9 @@ + + if(PYTHON_FOUND) + include_directories(${PYTHON_INCLUDE_PATH}) +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}") ++ set(CMAKE_MODULE_LINKER_FLAGS "${PYTHON_LFLAGS} -ldl -lutil -Wl,--hash-style=both -Wl,-O1 -Wl,--no-as-needed") + target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts) + endif() + ++ + install(TARGETS python LIBRARY DESTINATION ${LIBDIR}/plugins) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
