From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwaQA-0004Mi-St for guix-patches@gnu.org; Mon, 25 Sep 2017 16:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwaQ6-0004px-U0 for guix-patches@gnu.org; Mon, 25 Sep 2017 16:56:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:50351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwaQ6-0004po-N4 for guix-patches@gnu.org; Mon, 25 Sep 2017 16:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dwaQ6-00067j-DP for guix-patches@gnu.org; Mon, 25 Sep 2017 16:56:02 -0400 Subject: [bug#28562] [PATCHv2] gnu: eudev: Update to 3.2.4 and generate manpages. Resent-Message-ID: From: Maxim Cournoyer References: <87ingakr83.fsf@gmail.com> Date: Mon, 25 Sep 2017 16:54:57 -0400 In-Reply-To: (Thomas Danckaert's message of "Mon, 25 Sep 2017 10:33:42 +0200") Message-ID: <87ing6ijmm.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Thomas Danckaert Cc: 28562@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Thomas Danckaert writes: > Hi Maxim, > > thanks for the patch! > > Only one thing: we don't have to substitute the location of autoreconf > in autogen.sh: because autoconf is a native input, its executables are > already in the build environment PATH: > >> + '(#:phases >> + (modify-phases %standard-phases >> + (add-before 'configure 'bootstrap >> + (lambda* (#:key inputs #:allow-other-keys) >> + (substitute* "autogen.sh" >> + (("autoreconf") >> + (string-append (assoc-ref inputs "autoconf") >> + "/bin/autoreconf"))) > > If you agree, I can push with that change (and will try to remember to > push to staging :0) ). > > Thomas Hi Thomas, Thanks for the review! You are right about the unnecessary autoreconf substitution; I just removed that part and could rebuild successfully. If you need the modified patch I've attached it. Thank you! Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-eudev-Update-to-3.2.4-and-generate-manpages.patch Content-Transfer-Encoding: quoted-printable From=20a6c1ba796a49e46ef637a2b50e718692e01aafbc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 22 Sep 2017 23:24:23 -0400 Subject: [PATCH] gnu: eudev: Update to 3.2.4 and generate manpages. * gnu/packages/linux.scm (eudev)[version]: Bump to 3.2.4. [uri]: Download the release from Github, which contains the script to gener= ate the manpages from source. [file-name]: Add a file-name field to the origin record, per linter recomme= ndation. [sha256]: Adjust accordingly. [phases]: Add a bootstrap phase to regenerate the manpages. [configure-flags]: Add the "--enable-manpages" option, required to install = the manpages. [native-inputs]: Add autoconf, automake and libtool for the bootstrap phase. Add python-wrapper to run a test script that was previously skipped. Add docbook-xml, docbook-xsl, libxml2 and libxslt for manpage generation. =2D-- gnu/packages/linux.scm | 50 +++++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9352b4f65..29de3363f 100644 =2D-- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2055,30 +2055,50 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") =2D (version "3.2.2") + (version "3.2.4") (source (origin (method url-fetch) =2D (uri (string-append =2D "http://dev.gentoo.org/~blueness/eudev/eudev-" =2D version ".tar.gz")) + (uri (string-append "https://github.com/gentoo/eudev/archive= /v" + version ".zip")) + (file-name (string-append name "-" version ".zip")) (sha256 (base32 =2D "0qqgbgpm5wdllk0s04pf80nwc8pr93xazwri1bylm1f15zn5ck1y")) + "1r1ag0snarygrj5qqxi2xdq9w6g3sfjd5jx1b0fl7zmqlsz3vvxx")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments =2D '(#:phases (modify-phases %standard-phases =2D (add-after 'install 'build-hwdb =2D (lambda* (#:key outputs #:allow-other-keys) =2D ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsus= b' and =2D ;; similar tools to display product names. =2D (let ((out (assoc-ref outputs "out"))) =2D (zero? (system* (string-append out "/bin/udevadm= ") =2D "hwdb" "--update")))))))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "man/make.sh" + (("/usr/bin/xsltproc") + (string-append (assoc-ref inputs "xsltproc") + "/bin/xsltproc"))) + ;; Manual pages are regenerated here. + (zero? (system* "./autogen.sh")))) + (add-after 'install 'build-hwdb + (lambda* (#:key outputs #:allow-other-keys) + ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and + ;; similar tools to display product names. + (let ((out (assoc-ref outputs "out"))) + (zero? (system* (string-append out "/bin/udevadm") + "hwdb" "--update")))))) + #:configure-flags (list "--enable-manpages"))) (native-inputs =2D `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gperf" ,gperf) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ;; For tests. ("perl" ,perl) =2D ("gperf" ,gperf))) + ("python" ,python-wrapper) + ;; For documentation. + ("docbook-xml" ,docbook-xml-4.2) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES + ("xsltproc", libxslt))) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' fi= le, =2D-=20 2.14.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEFVwTvgZwWPWnh370K8v/MDHLu9sFAlnJbSEACgkQK8v/MDHL u9sDxQ/+IEuVapg0/fOzMnwuzEnsXB+HnVzhKwrl9ELfajlcGFpDhcLMx8Y2CDq1 gc5SO4ql5PcFAtrCG3w55iEUs1k27oWwH76dfeUsui9upSDAHPn5phNNnURsPfEC 6u8HiF5M1ycs38/Jd+QTilcmBt47NLG1h9D5/AbggIZk961wBFp9ku+VXVMVfmIM XSwhLybMr08UQJymp9VdwGNtrnoK0Xt/wqSqqg2ZLXzzS86zOujSTtAwsbQDELqo Yc8eWc7AzM9rSNIFMyhwYZeDxQCZQcxKvU1pNHZR1Ro3DQeIbEnWWFucXPe/ywtx MU6YyiO84D5Q3rORvhEzIrqwOzJCiYOCCHk1FjwE43az8z0HemZOvzgMZ6z33igV s6KUrRQP6Vj0Ck0oyGlMgPBjpVer/w2zHE3EbYP3Z4QyQ6Cu/mBPKjiw8ONRdgBv YhkueeyTDwAbQTBc7bzPJM7hDQw+JyJChyMrDkhLGg7BPYqIDTOje0LSn3hcGhlu Hkzwm8WQMvY+/Jn86+VqwIcjCX7XcbNdMJYS6md9bCY1Ij9/lqBrx8tNa85dN5Nk bv7iuU8RjkVaq/Swc+SwR3RilScbvZYiIACt4HCxiExTxupXfwcamYOtVLhdjjah UyMMFj0DJqzWsg+BMF7JcH8+//Psje0Xo107wKQAENBhkN9qtyk= =XDD+ -----END PGP SIGNATURE----- --==-=-=--