summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-12-03 19:07:24 +0000
committerEric Hameleers <alien@slackware.com>2019-12-04 08:59:50 +0100
commitd29002b2b2bba13ec5d668a22febddf2e4001f62 (patch)
tree7f3c963421bdacb55eb3bdf675bd15d547381952 /source/l
parent4355ff4c77d0aea75488f167a7cb890c80d1164b (diff)
downloadcurrent-d29002b2b2bba13ec5d668a22febddf2e4001f62.tar.gz
Tue Dec 3 19:07:24 UTC 201920191203190724
n/ebtables-2.0.11-x86_64-1.txz: Upgraded. n/iptables-1.8.4-x86_64-1.txz: Upgraded. n/libnftnl-1.1.5-x86_64-1.txz: Upgraded. n/nftables-0.9.3-x86_64-1.txz: Upgraded. n/whois-5.5.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
-rw-r--r--source/l/FTBFSlog3
-rwxr-xr-xsource/l/dconf/dconf.SlackBuild4
2 files changed, 5 insertions, 2 deletions
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index a249aca2..86834b4c 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Tue Dec 3 18:47:08 UTC 2019
+ dconf: also fix duplicate symbols for meson-0.52.1.
++--------------------------+
Thu Nov 21 22:04:10 UTC 2019
dconf: fix duplicate symbols building with meson.
+--------------------------+
diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild
index 8dd00267..927bba20 100755
--- a/source/l/dconf/dconf.SlackBuild
+++ b/source/l/dconf/dconf.SlackBuild
@@ -78,8 +78,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Fix duplicate symbols at link time with meson-0.52.0:
-if [ "$(meson --version)" = "0.52.0" ]; then
+# Fix duplicate symbols at link time with meson-0.52.{0,1}:
+if [ "$(meson --version)" = "0.52.0" -o "$(meson --version)" = "0.52.1" ]; then
sed -i "s/link_whole: libdconf_common,/link_with: libdconf_common,/g" common/meson.build
fi