diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-08 22:27:48 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-11 18:59:22 +0100 |
| commit | 9d3b6a5d65505018186d778c4812c3c90aab3527 (patch) | |
| tree | 00fbf23fda1fd78c996903d6f848d65763bdd0da | |
| parent | a82e6faa8b993d1f3b47a8bd22c4509f7cae7ec1 (diff) | |
| download | guix-patches-9d3b6a5d65505018186d778c4812c3c90aab3527.tar guix-patches-9d3b6a5d65505018186d778c4812c3c90aab3527.tar.gz | |
Revert "gnu: network-manager: Fix build with glibc 2.30."
This commit was obsolete by the time it was pushed, whoops!
This reverts commit 12818a0656817e95a80aace01089042c0b0e7e22.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/network-manager-gettid.patch | 20 |
3 files changed, 1 insertions, 23 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 802884a74f..7462445c98 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1195,7 +1195,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/network-manager-gettid.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 464f2ad818..37873e42bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5822,8 +5822,7 @@ users.") (uri (string-append "mirror://gnome/sources/NetworkManager/" (version-major+minor version) "/" "NetworkManager-" version ".tar.xz")) - (patches (search-patches "nm-plugin-path.patch" - "network-manager-gettid.patch")) + (patches (search-patches "nm-plugin-path.patch")) (sha256 (base32 "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3")) diff --git a/gnu/packages/patches/network-manager-gettid.patch b/gnu/packages/patches/network-manager-gettid.patch deleted file mode 100644 index d50b5f8102..0000000000 --- a/gnu/packages/patches/network-manager-gettid.patch +++ /dev/null @@ -1,20 +0,0 @@ -glibc 2.30 added gettid() which conflicts with the implementation in -NetworkManager. Remove for 1.17.1 and later versions. - -Adapted from upstream: -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/10276322bde8f015e48ac06f6a7509f514eb46f0 - ---- a/src/systemd/sd-adapt/nm-sd-adapt.h -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -181,9 +181,10 @@ - #endif - } - --static inline pid_t gettid(void) { -+static inline pid_t _nm_gettid(void) { - return (pid_t) syscall(SYS_gettid); - } -+#define gettid() _nm_gettid () - - /* we build with C11 and thus <uchar.h> provides char32_t,char16_t. */ - #define HAVE_CHAR32_T 1 |