Skip to content

Commit

Permalink
main/networkmanager: update to 1.50.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nekopsykose committed Oct 3, 2024
1 parent 6a83700 commit d4d9329
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
15 changes: 5 additions & 10 deletions main/networkmanager/patches/lto-no-gcc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,12 @@ diff --git a/meson.build b/meson.build
index 1a7dadf..0f9a6d0 100644
--- a/meson.build
+++ b/meson.build
@@ -163,13 +163,6 @@ if enable_ld_gc
@@ -173,7 +173,7 @@
endif

enable_lto = get_option('b_lto')
-if enable_lto
- # meson already adds '-flto'
- lto_flag = '-flto-partition=none'
- assert(cc.has_argument(lto_flag), '-flto-partition=none not supported. Disable link-time optimization with -Db_lto=false.')
- common_flags += lto_flag
- common_ldflags += lto_flag
-endif

common_flags += cc.get_supported_arguments([
'-Wall',
+if false
# meson already adds '-flto'
lto_flag = '-flto-partition=none'
assert(cc.has_argument(lto_flag), '-flto-partition=none not supported. Disable link-time optimization with -Db_lto=false.')
8 changes: 4 additions & 4 deletions main/networkmanager/template.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgname = "networkmanager"
pkgver = "1.48.10"
pkgrel = 1
pkgver = "1.50.0"
pkgrel = 0
build_style = "meson"
configure_args = [
"-Dsystemd_journal=false",
Expand All @@ -14,6 +14,7 @@
"-Ddhclient=/usr/bin/dhclient",
"-Ddhcpcd=/usr/bin/dhcpcd",
"-Diptables=/usr/bin/iptables",
"-Dmodprobe=/usr/bin/modprobe",
"-Dnft=/usr/bin/nft",
"-Dresolvconf=/usr/bin/resolvconf",
"-Ddnsmasq=/usr/bin/dnsmasq",
Expand Down Expand Up @@ -88,8 +89,7 @@
license = "GPL-2.0-or-later AND LGPL-2.1-or-later"
url = "https://wiki.gnome.org/Projects/NetworkManager"
source = f"https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/{pkgver}.tar.gz"
sha256 = "771ff4da24eab12bb45f0ce94b63667586e8dcfb5f9ae17f5d0bbd691e0ce15c"
patch_style = "patch"
sha256 = "d8bfc48ff787a9f823cf55b53e03313c455b7c73a2404b6e37d19aa1592bb10d"
# some tests use sysfs, + LD_BIND_NOW in tests does not work with our musl env
options = ["!check", "!cross", "linkundefver"]

Expand Down

0 comments on commit d4d9329

Please sign in to comment.