* core-updates: Fix eudev build failure
@ 2017-02-26 3:06 Leo Famulari
2017-02-26 14:37 ` Marius Bakke
0 siblings, 1 reply; 2+ messages in thread
From: Leo Famulari @ 2017-02-26 3:06 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 118 bytes --]
The update is not necessary to fix the build failure, but we might as
well update if we are rebuilding eudev anyways.
[-- Attachment #1.2: 0001-gnu-eudev-Update-to-3.2.1.patch --]
[-- Type: text/plain, Size: 1241 bytes --]
From 65c2a3f8edb1d8ef9dd32889acf833e5561329fa Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sat, 25 Feb 2017 21:45:44 -0500
Subject: [PATCH 1/2] gnu: eudev: Update to 3.2.1.
* gnu/packages/linux.scm (eudev): Update to 3.2.1.
---
gnu/packages/linux.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 03b7e295d..b3fd9d260 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1732,7 +1732,7 @@ from the module-init-tools project.")
;; The post-systemd fork, maintained by Gentoo.
(package
(name "eudev")
- (version "3.2")
+ (version "3.2.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1740,7 +1740,7 @@ from the module-init-tools project.")
version ".tar.gz"))
(sha256
(base32
- "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq"))
+ "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"))
(patches (search-patches "eudev-rules-directory.patch"))))
(build-system gnu-build-system)
(native-inputs
--
2.11.1
[-- Attachment #1.3: 0002-gnu-eudev-Fix-build-failure-caused-by-conflicting-fu.patch --]
[-- Type: text/plain, Size: 3382 bytes --]
From da6db68dae4bb2573ee75f304c7d61b5b88089e4 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sat, 25 Feb 2017 21:59:09 -0500
Subject: [PATCH 2/2] gnu: eudev: Fix build failure caused by conflicting
function type declaration.
* gnu/packages/patches/eudev-conflicting-declaration.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (eudev)[source]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/linux.scm | 3 ++-
.../patches/eudev-conflicting-declaration.patch | 31 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/eudev-conflicting-declaration.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 3623bbb49..6f7bed9d1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -541,6 +541,7 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/eudev-rules-directory.patch \
+ %D%/packages/patches/eudev-conflicting-declaration.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
%D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b3fd9d260..fe72f98b7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1741,7 +1741,8 @@ from the module-init-tools project.")
(sha256
(base32
"06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"))
- (patches (search-patches "eudev-rules-directory.patch"))))
+ (patches (search-patches "eudev-rules-directory.patch"
+ "eudev-conflicting-declaration.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch b/gnu/packages/patches/eudev-conflicting-declaration.patch
new file mode 100644
index 000000000..f5399e20d
--- /dev/null
+++ b/gnu/packages/patches/eudev-conflicting-declaration.patch
@@ -0,0 +1,31 @@
+Fix build failure due to conflicting declaration of
+keyboard_lookup_key() in gperf-3.1:
+
+https://bugs.gentoo.org/show_bug.cgi?id=604864
+
+Patch copied from upstream source repository:
+
+https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60
+
+From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Thu, 5 Jan 2017 16:21:17 -0500
+Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ src/udev/udev-builtin-keyboard.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
+index 73171c3..fad3520 100644
+--- a/src/udev/udev-builtin-keyboard.c
++++ b/src/udev/udev-builtin-keyboard.c
+@@ -28,7 +28,6 @@
+
+ #include "udev.h"
+
+-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
+ #include "keyboard-keys-from-name.h"
+ #include "keyboard-keys-to-name.h"
+
--
2.11.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: core-updates: Fix eudev build failure
2017-02-26 3:06 core-updates: Fix eudev build failure Leo Famulari
@ 2017-02-26 14:37 ` Marius Bakke
0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2017-02-26 14:37 UTC (permalink / raw)
To: Leo Famulari, guix-devel
[-- Attachment #1: Type: text/plain, Size: 5049 bytes --]
Leo Famulari <leo@famulari.name> writes:
> The update is not necessary to fix the build failure, but we might as
> well update if we are rebuilding eudev anyways.
Thanks! These patches LGTM.
> From 65c2a3f8edb1d8ef9dd32889acf833e5561329fa Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Sat, 25 Feb 2017 21:45:44 -0500
> Subject: [PATCH 1/2] gnu: eudev: Update to 3.2.1.
>
> * gnu/packages/linux.scm (eudev): Update to 3.2.1.
> ---
> gnu/packages/linux.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 03b7e295d..b3fd9d260 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1732,7 +1732,7 @@ from the module-init-tools project.")
> ;; The post-systemd fork, maintained by Gentoo.
> (package
> (name "eudev")
> - (version "3.2")
> + (version "3.2.1")
> (source (origin
> (method url-fetch)
> (uri (string-append
> @@ -1740,7 +1740,7 @@ from the module-init-tools project.")
> version ".tar.gz"))
> (sha256
> (base32
> - "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq"))
> + "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"))
> (patches (search-patches "eudev-rules-directory.patch"))))
> (build-system gnu-build-system)
> (native-inputs
> --
> 2.11.1
>
> From da6db68dae4bb2573ee75f304c7d61b5b88089e4 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Sat, 25 Feb 2017 21:59:09 -0500
> Subject: [PATCH 2/2] gnu: eudev: Fix build failure caused by conflicting
> function type declaration.
>
> * gnu/packages/patches/eudev-conflicting-declaration.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/linux.scm (eudev)[source]: Use it.
> ---
> gnu/local.mk | 1 +
> gnu/packages/linux.scm | 3 ++-
> .../patches/eudev-conflicting-declaration.patch | 31 ++++++++++++++++++++++
> 3 files changed, 34 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/eudev-conflicting-declaration.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 3623bbb49..6f7bed9d1 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -541,6 +541,7 @@ dist_patch_DATA = \
> %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
> %D%/packages/patches/emacs-source-date-epoch.patch \
> %D%/packages/patches/eudev-rules-directory.patch \
> + %D%/packages/patches/eudev-conflicting-declaration.patch \
> %D%/packages/patches/evilwm-lost-focus-bug.patch \
> %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
> %D%/packages/patches/fastcap-mulGlobal.patch \
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index b3fd9d260..fe72f98b7 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -1741,7 +1741,8 @@ from the module-init-tools project.")
> (sha256
> (base32
> "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"))
> - (patches (search-patches "eudev-rules-directory.patch"))))
> + (patches (search-patches "eudev-rules-directory.patch"
> + "eudev-conflicting-declaration.patch"))))
> (build-system gnu-build-system)
> (native-inputs
> `(("pkg-config" ,pkg-config)
> diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch b/gnu/packages/patches/eudev-conflicting-declaration.patch
> new file mode 100644
> index 000000000..f5399e20d
> --- /dev/null
> +++ b/gnu/packages/patches/eudev-conflicting-declaration.patch
> @@ -0,0 +1,31 @@
> +Fix build failure due to conflicting declaration of
> +keyboard_lookup_key() in gperf-3.1:
> +
> +https://bugs.gentoo.org/show_bug.cgi?id=604864
> +
> +Patch copied from upstream source repository:
> +
> +https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60
> +
> +From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001
> +From: "Anthony G. Basile" <blueness@gentoo.org>
> +Date: Thu, 5 Jan 2017 16:21:17 -0500
> +Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1
> +
> +Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
> +---
> + src/udev/udev-builtin-keyboard.c | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
> +index 73171c3..fad3520 100644
> +--- a/src/udev/udev-builtin-keyboard.c
> ++++ b/src/udev/udev-builtin-keyboard.c
> +@@ -28,7 +28,6 @@
> +
> + #include "udev.h"
> +
> +-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
> + #include "keyboard-keys-from-name.h"
> + #include "keyboard-keys-to-name.h"
> +
> --
> 2.11.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-26 14:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-26 3:06 core-updates: Fix eudev build failure Leo Famulari
2017-02-26 14:37 ` Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.