summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/easy-kernel-power8-64k/APKBUILD2
-rw-r--r--system/easy-kernel-power8-64k/config-ppc649
-rw-r--r--system/easy-kernel-power8/APKBUILD2
-rw-r--r--system/easy-kernel-power8/config-ppc649
-rw-r--r--system/easy-kernel/APKBUILD12
-rw-r--r--system/easy-kernel/config-aarch649
-rw-r--r--system/easy-kernel/config-pmmx9
-rw-r--r--system/easy-kernel/config-ppc9
-rw-r--r--system/easy-kernel/config-ppc649
-rw-r--r--system/easy-kernel/config-sparc649
-rw-r--r--system/easy-kernel/config-x86_644
-rw-r--r--user/grub/APKBUILD3
-rw-r--r--user/libpeas/APKBUILD2
-rw-r--r--user/notmuch/APKBUILD4
-rw-r--r--user/py3-configargparse/APKBUILD1
-rw-r--r--user/weechat/APKBUILD9
-rw-r--r--user/weechat/python.patch86
17 files changed, 142 insertions, 46 deletions
diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD
index 1d9fe9e88..27ebd41c8 100644
--- a/system/easy-kernel-power8-64k/APKBUILD
+++ b/system/easy-kernel-power8-64k/APKBUILD
@@ -91,4 +91,4 @@ src() {
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
61eda169a4bd195202f1cf82a6d7c8ff10e420cfa1ad67ab8346ed868e154196e9c13002bf4849d6afe6d7115bcd139c6bb395791446ec2f69aa2adebfdf675f linux-4.14-mc14.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
-bbc4301d1d737250f3539594ceccc29cc212947f47f1c9b50a9598977820f03750d9136e4ae9a0a6a3ec49b04d2ee14cb9c11ba99ac6a418f737843ce4b6ee93 config-ppc64"
+422336fc20b3324a9de9009a4d57a7747d6e3140dac317ddfd22ee0c560dc58cf47eb7374fe75a636b8e05d58c97b0ceed52ab5c4607ce6354e8650c882d73cc config-ppc64"
diff --git a/system/easy-kernel-power8-64k/config-ppc64 b/system/easy-kernel-power8-64k/config-ppc64
index cb2f07c03..d9584836d 100644
--- a/system/easy-kernel-power8-64k/config-ppc64
+++ b/system/easy-kernel-power8-64k/config-ppc64
@@ -4512,10 +4512,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD
index ca1bdcd19..84b5ba98f 100644
--- a/system/easy-kernel-power8/APKBUILD
+++ b/system/easy-kernel-power8/APKBUILD
@@ -91,4 +91,4 @@ src() {
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
61eda169a4bd195202f1cf82a6d7c8ff10e420cfa1ad67ab8346ed868e154196e9c13002bf4849d6afe6d7115bcd139c6bb395791446ec2f69aa2adebfdf675f linux-4.14-mc14.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
-2e2c4873ef3ecbb4f593c3e6771f5ba3fa80a12c5feda9129044eb94209a26ed093cc78ffda01455acf80860e7c3e8aa353c08f1b3ba2addd46f9772370e7b5c config-ppc64"
+96087e21d25d7d30542c01baf0a93c43cc9dbc891e70a6ca1df47017780b33b5f9e0d2dfed855b2fb0ca0f8e7c02daf949ba91654b1850f7636deab885be3c38 config-ppc64"
diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64
index 48cf1c915..2874286eb 100644
--- a/system/easy-kernel-power8/config-ppc64
+++ b/system/easy-kernel-power8/config-ppc64
@@ -4511,10 +4511,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index d0b90aafb..e25fe6ac6 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -131,11 +131,11 @@ src() {
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
61eda169a4bd195202f1cf82a6d7c8ff10e420cfa1ad67ab8346ed868e154196e9c13002bf4849d6afe6d7115bcd139c6bb395791446ec2f69aa2adebfdf675f linux-4.14-mc14.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
-5566ca7a3070183650688b02a52ba7d72f835929ec273cb5c38fd37671c0c8d08f96ac3b59a994b94078498fb421fca3f5c069168812d1d6cf0e0c79b6232d39 config-ppc64
-e959b84a16af211e2c2e91d098ba8132e11204ae8a3f6d0823b0df169f955865dbe804fe0a6e9ed22b3079ac5e6e3609f90fea84450f405dbb704d016d70519d config-ppc
-9cb39964bbeadd2406e8d25b76f9dccede048a73f79164fdd3d235625932b71f826d568c7532ebb6a3dd8724e514b9be97ed070b261a78dd9ce9311def76e622 config-x86_64
-db716a4ffa6d33cddfef43fb882009f44c5e08188576a7ee8893b6402eb1d29a0694d561634f119fe66b9db3047b4b1f53cd6c05835217f4aef33ddb729dbafb config-pmmx
-39539f67496ab23397e46f6c8ff618d2fe5e057bd17b577fc59c60061cda6b71c5ddbef293287d00a8c37994f7c20e532b69a7493ee3fb3e13a4b8f1874b2c1f config-aarch64
-e18f7818b67b9aa5acfcfc5a59836c5b115bf56f7e003bedd425403574276ad17613e8a6518f011c956c46fa71331c662eea9746a6f014c4c9c6b8f3487f3460 config-sparc64
+396617ee921b15074d4bb0caed50a30c99b2b33d0f884fbc209d260c88194748cc2924d18aa5fcb1032c5066e955f1bd1916239771fdfdfbba2e88165830a1af config-ppc64
+c66fc39049c5d1d6d8f19c8f5258cdf51d617d074c69d4850f432f2c14ff96f9f526259743eeeecddcecd3bde92627486e3541d26b9ba54ae255708c2ca7a69c config-ppc
+6c8beb705d27b10115ecea177b94b41da3e4583313f85ce5df79591e76627a912af5b15edab3e499968bbea49f086a93d5130f9efe5d532da193c55e22ec41ce config-x86_64
+573007009d41a3b7513fb8ad82d55824cb674b8cfa328b58244e26e0554a0db505bd1b063e644974544c6c72414e195f753c5478e9d19f46ff0e268518676286 config-pmmx
+709b55f770bd08434760d52eaea432a678b7ee9ec67cb5dd0ab83f8421e3ada6857c80c709a2b1163f52bd7316539e1833dc271f45a3312ee790fe2d3e62652f config-aarch64
+8c5e4e1292d63a972b21f20b4f6341266429d51cf491df3d48f8f61cf3e4e96913937a9b651b9e097311723d83d70af6ab5ba9891e379eb0e0aa457d432b85f5 config-sparc64
6594f07d9d741c37ced99ce1bd9a9c10f0fb2f1a44e64da318d9350a8f6bb69b004382bd66e1a08baf8e581e7eeffb37488cfb6002ab61b0e7c8474afcae1a29 config-m68k
fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h"
diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64
index 953b40ad5..754756408 100644
--- a/system/easy-kernel/config-aarch64
+++ b/system/easy-kernel/config-aarch64
@@ -6188,10 +6188,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx
index 733df6808..921880a89 100644
--- a/system/easy-kernel/config-pmmx
+++ b/system/easy-kernel/config-pmmx
@@ -6141,10 +6141,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_PADLOCK is not set
diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc
index 029a61bde..3b5bbc5bc 100644
--- a/system/easy-kernel/config-ppc
+++ b/system/easy-kernel/config-ppc
@@ -4963,10 +4963,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64
index c8927c076..d497143e3 100644
--- a/system/easy-kernel/config-ppc64
+++ b/system/easy-kernel/config-ppc64
@@ -4562,10 +4562,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/system/easy-kernel/config-sparc64 b/system/easy-kernel/config-sparc64
index 980b3264a..54771f50b 100644
--- a/system/easy-kernel/config-sparc64
+++ b/system/easy-kernel/config-sparc64
@@ -4164,10 +4164,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64
index 83e9c4e1b..b802ae264 100644
--- a/system/easy-kernel/config-x86_64
+++ b/system/easy-kernel/config-x86_64
@@ -6636,8 +6636,8 @@ CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_USER_API=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 7c3123ecb..6e5ff59c7 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -45,6 +45,9 @@ _build_flavor() {
local flavor="$1"
shift
local _configure="$@"
+ case $CTARGET_ARCH in
+ ppc64) export CFLAGS="-O2 -ggdb -mcpu=970";; # Workaround for http://savannah.gnu.org/bugs/?52629
+ esac
msg "Building grub for platform $flavor"
mkdir -p "$srcdir"/build-$flavor
diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD
index 942d22442..c8dccafca 100644
--- a/user/libpeas/APKBUILD
+++ b/user/libpeas/APKBUILD
@@ -28,7 +28,7 @@ build() {
check() {
cd "$builddir"
- make check
+ DISPLAY= make check
}
package() {
diff --git a/user/notmuch/APKBUILD b/user/notmuch/APKBUILD
index c97dce2cc..b585d685f 100644
--- a/user/notmuch/APKBUILD
+++ b/user/notmuch/APKBUILD
@@ -36,8 +36,8 @@ build() {
check() {
cd "$builddir"
# config, regexp-query: musl issues, TODO: Fixed in master
- # count, insert: gdb-based tests which fail at some optimization levels, or w/o -g.
- NOTMUCH_SKIP_TESTS="config regexp-query count insert" make check
+ # atomicity, count, new, insert: gdb-based tests which fail randomly on some arches, with some CFLAGS, or during some moon phases
+ NOTMUCH_SKIP_TESTS="config regexp-query atomicity count new insert" make check
}
package() {
diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD
index 4641df6e8..0d7d93490 100644
--- a/user/py3-configargparse/APKBUILD
+++ b/user/py3-configargparse/APKBUILD
@@ -9,6 +9,7 @@ pkgrel=0
pkgdesc="A drop-in replacement for argparse"
url="https://github.com/bw2/ConfigArgParse"
arch="noarch"
+options="!check" # https://github.com/bw2/ConfigArgParse/issues/146
license="MIT"
depends="python3"
makedepends="python3-dev python3-tests"
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index 3776d522d..5c8d91b84 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=weechat
pkgver=2.5
-pkgrel=0
+pkgrel=1
pkgdesc="Fast, light, extensible ncurses-based chat client"
url="https://www.weechat.org"
arch="all"
@@ -17,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin
$pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang"
source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
libintl-fix.patch
+ python.patch
"
# secfixes:
@@ -48,9 +49,6 @@ _plugin() {
local _dir=usr/lib/weechat/plugins
pkgdesc="WeeChat $_name plugin"
depends="weechat"
- if [ "$_name" = python ]; then
- depends="$depends python3"
- fi
if [ "$_name" = spell ]; then
provides="$pkgname-aspell=$pkgver-r$pkgrel"
fi
@@ -65,4 +63,5 @@ check() {
}
sha512sums="1bf16c76e63668fc6d4b72d521f71980717b08bd2abc5c7f0825af32e6de9327c5c967067bfb025a0404eee627f54cecdd9f1f2b3618ea7a08798d8510a2487b weechat-2.5.tar.gz
-59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch"
+59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch
+b77bd5f31bf4547d1d5505fec5018b867f0b597ed0b6819d4ed0ff6a2b7f664f2308f6c1b094debc381673b4de6208f09ca36da3413eb72f40aca9924464d746 python.patch"
diff --git a/user/weechat/python.patch b/user/weechat/python.patch
new file mode 100644
index 000000000..a6e194719
--- /dev/null
+++ b/user/weechat/python.patch
@@ -0,0 +1,86 @@
+--- weechat-2.5/cmake/FindPython.cmake 2019-06-06 18:43:20.000000000 +0000
++++ weechat-2.5/cmake/FindPython.cmake 2019-06-24 12:22:10.659972390 +0000
+@@ -25,7 +25,6 @@
+ #
+ # PYTHON_EXECUTABLE = full path to the python binary
+ # PYTHON_INCLUDE_PATH = path to where python.h can be found
+-# PYTHON_LIBRARY = path to where libpython.so* can be found
+ # PYTHON_LFLAGS = python compiler options for linking
+
+ if(PYTHON_FOUND)
+@@ -38,11 +37,19 @@
+ NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+ PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ )
++ find_program(PYTHON_CONFIG
++ NAMES python3-config
++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin
++ )
+ else()
+ find_program(PYTHON_EXECUTABLE
+ NAMES python2.7 python2.6 python2.5 python
+ PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ )
++ find_program(PYTHON_CONFIG
++ NAMES python-config
++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin
++ )
+ endif()
+
+ if(PYTHON_EXECUTABLE)
+@@ -52,32 +59,17 @@
+ )
+
+ execute_process(
+- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
+- OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
+- )
+-
+- execute_process(
+- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))"
++ COMMAND ${PYTHON_CONFIG} --libs
+ OUTPUT_VARIABLE PYTHON_LFLAGS
++ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ find_path(PYTHON_INCLUDE_PATH
+ NAMES Python.h
+ HINTS ${PYTHON_INC_DIR}
+ )
+- if(ENABLE_PYTHON3)
+- find_library(PYTHON_LIBRARY
+- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+- HINTS ${PYTHON_POSSIBLE_LIB_PATH}
+- )
+- else()
+- find_library(PYTHON_LIBRARY
+- NAMES python2.7 python2.6 python2.5 python
+- HINTS ${PYTHON_POSSIBLE_LIB_PATH}
+- )
+- endif()
+
+- if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
++ if(PYTHON_LFLAGS AND PYTHON_INCLUDE_PATH)
+ execute_process(
+ COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+ OUTPUT_VARIABLE PYTHON_VERSION
+@@ -96,7 +88,6 @@
+ mark_as_advanced(
+ PYTHON_EXECUTABLE
+ PYTHON_INCLUDE_PATH
+- PYTHON_LIBRARY
+ PYTHON_LFLAGS
+ )
+
+--- weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-06 18:43:20.000000000 +0000
++++ weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-24 12:22:16.259972363 +0000
+@@ -24,8 +24,7 @@
+
+ if(PYTHON_FOUND)
+ include_directories(${PYTHON_INCLUDE_PATH})
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}")
+- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts coverage_config)
++ target_link_libraries(python ${PYTHON_LFLAGS} weechat_plugins_scripts coverage_config)
+ endif()
+
+ install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-13 03:17:17 +0000