aboutsummaryrefslogtreecommitdiffstats
path: root/community/networkmanager
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-05-04 18:15:26 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2019-05-04 19:15:28 +0000
commit377e36549726e84308d76450069060a9082366bf (patch)
tree4d3ff2cc458cb7486bc22bcaed0a9f3e5560ac04 /community/networkmanager
parentdcd5aac94a1fc54a4d368edae6b085d618010856 (diff)
downloadaports-377e36549726e84308d76450069060a9082366bf.tar.bz2
aports-377e36549726e84308d76450069060a9082366bf.tar.xz
community/networkmanager: fix ppc64le build
Also clarify the instructions for iwd a bit while I'm at it. Closes GH-7551
Diffstat (limited to 'community/networkmanager')
-rw-r--r--community/networkmanager/APKBUILD8
-rw-r--r--community/networkmanager/fix-ppc64le-build.patch12
2 files changed, 17 insertions, 3 deletions
diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 3508ec6ccf..0795c17d04 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=networkmanager
pkgver=1.18.1
-pkgrel=0
+pkgrel=1
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all"
@@ -46,6 +46,7 @@ source="https://download.gnome.org/sources/NetworkManager/${pkgver:0:4}/NetworkM
musl-process-util.patch
musl-has-not-secure-getenv.patch
musl-compar.patch
+ fix-ppc64le-build.patch
"
options="!check" # fail to compile on musl
@@ -98,7 +99,7 @@ package() {
cat > $pkgdir/usr/share/doc/$pkgname/README.alpine <<EOF
To modify system network connections without the root password: add your user account to the 'plugdev' group, or use Polkit.
-To use iwd instead of the default wpa_supplicant install iwd and the following to your /etc/NetworkManager/NetworkManager.conf:
+To use iwd instead of the default wpa_supplicant install iwd, start its service and the following to your /etc/NetworkManager/NetworkManager.conf:
[device]
wifi.backend=iwd
@@ -114,4 +115,5 @@ a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faea
a3fe34eb93cb918650390ea01696a8e8489455a89721e479d6b83ab730f6608e9cf78cd0d993e7c8051708b695eea420490e36d85d400fa39ec0ff5d3882d26b musl-fix-includes.patch
b5cd94928ca3ba1fb71aec28d9ff66f319f6d23131e02c90f1dfbfaf16c537935228a9981c95f29ffb74e91752a17801c94d09ca57b7ba98028262b9e8e5d322 musl-process-util.patch
76b6728389686c91df6acafbbe17af7f0e01971e5f7185e164dcb39f93982ac6b73fc2cdf0ba2018e3fa80321178621fe2a5d910546de98bfc52484aa5d90d34 musl-has-not-secure-getenv.patch
-634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2 musl-compar.patch"
+634377674691b52da80ca4c445a727d39cd40269f7deef0d3ccc1e1041cc262e8bc1423200e9a2b0cf1804e9950059ebbbc827f1200c6a97c58bc76080a6d6d2 musl-compar.patch
+c2dbdf31adb472dc6b14aad6d7a0981b2618880df7c9081ebb9bc6da8af4c5e791c36c4e997878d5e1e7f96bd65814f718e7ae23dcfea5ac5aa91acdab3775ae fix-ppc64le-build.patch"
diff --git a/community/networkmanager/fix-ppc64le-build.patch b/community/networkmanager/fix-ppc64le-build.patch
new file mode 100644
index 0000000000..f03a3b478b
--- /dev/null
+++ b/community/networkmanager/fix-ppc64le-build.patch
@@ -0,0 +1,12 @@
+diff --git a/libnm/meson.build b/libnm/meson.build
+index 4b3df97..31c6fa6 100644
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -162,6 +162,7 @@ libnm = shared_library(
+ libnm_core_dep,
+ uuid_dep,
+ libnm_systemd_shared_no_logging_dep,
++ libnmdbus_dep,
+ ],
+ c_args: cflags,
+ link_with: libnm_utils,