From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: core-updates: Fix eudev build failure Date: Sun, 26 Feb 2017 15:37:35 +0100 Message-ID: <87poi5f26o.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170226030654.GA16338@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chzxI-0004xU-QO for guix-devel@gnu.org; Sun, 26 Feb 2017 09:37:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chzxF-0008Nn-AT for guix-devel@gnu.org; Sun, 26 Feb 2017 09:37:44 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36049) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chzxF-0008NP-0J for guix-devel@gnu.org; Sun, 26 Feb 2017 09:37:41 -0500 In-Reply-To: <20170226030654.GA16338@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari , guix-devel@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari 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 > 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 > --=20 > 2.11.1 > > From da6db68dae4bb2573ee75f304c7d61b5b88089e4 Mon Sep 17 00:00:00 2001 > From: Leo Famulari > 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.pa= tch > > 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 =3D \ > %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.pa= tch")))) > (build-system gnu-build-system) > (native-inputs > `(("pkg-config" ,pkg-config) > diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch b/g= nu/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=3D604864 > + > +Patch copied from upstream source repository: > + > +https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea16= 52a0d60 > + > +From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001 > +From: "Anthony G. Basile" > +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 > +--- > + 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-ke= yboard.c > +index 73171c3..fad3520 100644 > +--- a/src/udev/udev-builtin-keyboard.c > ++++ b/src/udev/udev-builtin-keyboard.c > +@@ -28,7 +28,6 @@ > +=20 > + #include "udev.h" > +=20 > +-static const struct key *keyboard_lookup_key(const char *str, unsigned = len); > + #include "keyboard-keys-from-name.h" > + #include "keyboard-keys-to-name.h" > +=20 > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliy6DAACgkQoqBt8qM6 VPpKOAf9GUGfdgrAkicKZd3KhH3UlxLjQd9KDxRdUxCuBa7ll4qke4yZKCjqTaaD 1GAeMiH5WndAj33vYk1DrvtssV/kVPwjzuL7Ilt39FLVr3V2LWZypH5UFbClq4i0 1Jf3qQtX1Y6cNAQz/pQ4fmI6VMhFw5LY8nPO9u3CO2AxfoVwk9rJdjTmDToo9G5k hCqwrZsKj+s7/q0ivaXx57EcY9hYxBmHS63V8ksEVQtKEP/X9pc5xBXHuzq15r6M SuOpgl5+aXSBp4lQN/l10yXUGyd4NUAZq4fWbwAPGVqD4FVdsPexrJ9pbnySRXXF seMToxQAOvKXpQZjzBgwzsuJmKvmDQ== =CHIC -----END PGP SIGNATURE----- --=-=-=--