From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQh5O-0004Qx-Br for guix-patches@gnu.org; Sun, 17 Dec 2017 17:07:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQh5K-00079P-OX for guix-patches@gnu.org; Sun, 17 Dec 2017 17:07:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:58975) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQh5K-00079F-K1 for guix-patches@gnu.org; Sun, 17 Dec 2017 17:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eQh5K-0007Op-Dc for guix-patches@gnu.org; Sun, 17 Dec 2017 17:07:02 -0500 Subject: [bug#29760] [PATCH] surfraw: hardcode perl during build time Resent-Message-ID: Date: Sun, 17 Dec 2017 22:06:31 +0000 From: ng0 Message-ID: <20171217220631.r4aplx5zehvgmrgr@abyayala> References: <1513547487.163724.1208065704.02B619BB@webmail.messagingengine.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="26x5tdxnfyw4h5x3" Content-Disposition: inline In-Reply-To: <1513547487.163724.1208065704.02B619BB@webmail.messagingengine.com> 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: Mark Meyer Cc: 29760@debbugs.gnu.org --26x5tdxnfyw4h5x3 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Mark Meyer transcribed 5.7K bytes: > Hi Guix, > the following patch make surfraw search for perl during build time and > code the path to perl into the surfraw script. >=20 > Cheers, Mark >=20 > --=20 > Mark Meyer > mark@ofosos.org > From dcc195481cb84f295a364c2c7cb023f33899745e Mon Sep 17 00:00:00 2001 > From: Mark Meyer > Date: Sun, 17 Dec 2017 22:47:15 +0100 > Subject: [PATCH] gnu: surfraw: Find path to perl. >=20 > * gnu/packages/patches/surfraw-find-perl.patch: New file. Could you mention in the patch (or somewhere) that you've sent this patch upstream for inclusion? I have some build-system patches waiting in surfraw aswell, but I didn't think they were really necessary to include in Guix. The patch looks okay to me, need to run it to give my final okay. Thanks for the work on it. > * gnu/packages/web.scm (surfraw)[native-inputs]: Add autoconf, automake. > [package]: Add surfraw-find-perl.patch. > [arguments]: Add 'autoreconf phase. > --- > gnu/packages/patches/surfraw-find-perl.patch | 35 ++++++++++++++++++++++= ++++++ > gnu/packages/web.scm | 9 ++++++- > 2 files changed, 43 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/surfraw-find-perl.patch >=20 > diff --git a/gnu/packages/patches/surfraw-find-perl.patch b/gnu/packages/= patches/surfraw-find-perl.patch > new file mode 100644 > index 000000000..b995ab025 > --- /dev/null > +++ b/gnu/packages/patches/surfraw-find-perl.patch > @@ -0,0 +1,35 @@ > +diff -Naur surfraw-2.2.9-orig/configure.in surfraw-2.2.9/configure.in > +--- surfraw-2.2.9-orig/configure.in 2013-12-10 18:07:06.000000000 +0100 > ++++ surfraw-2.2.9/configure.in 2017-12-17 22:19:14.648432687 +0100 > +@@ -53,6 +53,8 @@ > + dnl Checks for programs. > + AC_PROG_INSTALL > + AC_PROG_AWK > ++AC_PATH_PROG([PERL], [perl], [perl]) > ++AC_SUBST(PERL) > +=20 > + AC_CONFIG_FILES([Makefile surfraw.lsm surfraw.spec elvi/Makefile test/M= akefile examples/Makefile]) > + AC_OUTPUT > +diff -Naur surfraw-2.2.9-orig/Makefile.am surfraw-2.2.9/Makefile.am > +--- surfraw-2.2.9-orig/Makefile.am 2013-12-10 18:07:06.000000000 +0100 > ++++ surfraw-2.2.9/Makefile.am 2017-12-17 22:13:48.205031190 +0100 > +@@ -35,6 +35,7 @@ > + sed -e 's,@VERSION\@,${VERSION},g; '\ > + -e 's,@ELVIDIR\@,${ELVIDIR},g; '\ > + -e 's,@AWK\@,${AWK},g; '\ > ++ -e 's,@PERL\@,${PERL},g; '\ > + -e 's,@sysconfdir\@,${sysconfdir},g ' $? > $@.tmp > + chmod +x $@.tmp > + mv $@.tmp $@ > +diff -Naur surfraw-2.2.9-orig/surfraw.IN surfraw-2.2.9/surfraw.IN > +--- surfraw-2.2.9-orig/surfraw.IN 2013-12-10 18:07:06.000000000 +0100 > ++++ surfraw-2.2.9/surfraw.IN 2017-12-17 22:14:01.613171144 +0100 > +@@ -160,7 +160,7 @@ > +=20 > + quote_ifs () { > + if [ -z "$1" ]; then return; fi > +- perl -e '$ifs=3D$ENV{IFS} || " "; $arg=3Dshift;if($arg =3D~/[$ifs]= /) { $arg=3D"\"$arg\""; } print "$arg\n"; ' -- "$1" > ++ @PERL@ -e '$ifs=3D$ENV{IFS} || " "; $arg=3Dshift;if($arg =3D~/[$if= s]/) { $arg=3D"\"$arg\""; } print "$arg\n"; ' -- "$1" > + } > +=20 > + bookmark_file_search () { > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > index eb0436cb3..766582ab1 100644 > --- a/gnu/packages/web.scm > +++ b/gnu/packages/web.scm > @@ -4701,11 +4701,15 @@ handling many of the web standards in use today.") > name "-" version ".tar.gz")) > (sha256 > (base32 > - "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"))= )) > + "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa")) > + (patches (search-patches "surfraw-find-perl.patch")))) > (build-system gnu-build-system) > (arguments > `(#:phases > (modify-phases %standard-phases > + (add-after 'unpack 'autoreconf ; required for the patch > + (lambda* _ > + (zero? (system* "autoreconf")))) > (add-after 'install 'compress-elvi.1sr > (lambda* (#:key outputs #:allow-other-keys) > ;; The manpages of the elvis are symlinks to elvi.1sr.gz > @@ -4714,6 +4718,9 @@ handling many of the web standards in use today.") > (man (string-append out "/share/man/man1"))) > (with-directory-excursion man > (zero? (system* "gzip" "elvi.1sr"))))))))) > + (native-inputs > + `(("autoconf" ,autoconf) > + ("automake" ,automake))) > (inputs > `(("perl" ,perl) > ("perl-www-opensearch" ,perl-www-opensearch) > --=20 > 2.15.1 >=20 --=20 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys WWW: https://n0.is --26x5tdxnfyw4h5x3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlo26mcACgkQ4i+bv+40 hYgqrQ/+Lwcq6OVvE4lNtq8NDQBGlBo9jNBoi8SdRYs+rGN1bFAEEkyNjZwlKVbR 2h3NfyaZtl5AxPo4pBWbxK2+6kWIA8T43rFo5C3rVCgSrUoTTCy7PKzNxL/6tV2S nqk3Z3xbZryr3tio4211yq+mK/7B1WOQ6MGGQNwIrb9q3147u4V/B3fJ6qcDLuDx FJfS8ym5s94ladngWcKJQAPqdHM51tFwATqZkvRvYwPE8IMRvKed05Rx7Lgz8vEN zCRP/CZzI0IaISZWbGXM8o5qR8QhYZO/ZL426l/V6Psmxx8jqF5xQ72YGE6s68ze YpC5gAcEwCy69TFSNMXw7xvOT/ONAJToJgAA3gEIroumJ1sdkWHD8NvXoBG0T629 QpvwJuZLONmcAfu09RQMA6EJYgTLi2XxDrwRPmJAMHMUhQbgaijMjmGQzhKx0uMs U9J1rk1v9oJiCohB9HAKTfa03hvsIaSUhqMD35zJUiaeZTdxSl8JqMIZFMLNYWyn w1ljBY1cvUwYM4e3pZqTTCcPB5OPNXXEh91pxRQVipczWgkDFbAMBunim/6cYkzr Iqcv/jvJu0pj5BlDO06o57oFKfvvKtf1VF/BTPeAaqcHrEsC3y0RmDYkRkDxUboF FJlYfcYrBM7kRa8Qf2VMWSboDgPhzSLJm4hH2GmJhJbbTGhgOpE= =O6Rd -----END PGP SIGNATURE----- --26x5tdxnfyw4h5x3--