From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add p7zip. Date: Tue, 02 Aug 2016 11:54:50 -0400 Message-ID: <87a8gvxj1x.fsf@openmailbox.org> References: <87a8gwxa9c.fsf@openmailbox.org> <87y44f4plm.fsf@mdc-berlin.de> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUc2H-0000Gf-W7 for guix-devel@gnu.org; Tue, 02 Aug 2016 11:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUc2D-0005ou-Ra for guix-devel@gnu.org; Tue, 02 Aug 2016 11:55:16 -0400 Received: from mail2.openmailbox.org ([62.4.1.33]:45284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUc2D-0005oc-IW for guix-devel@gnu.org; Tue, 02 Aug 2016 11:55:13 -0400 In-Reply-To: <87y44f4plm.fsf@mdc-berlin.de> (Ricardo Wurmus's message of "Tue, 2 Aug 2016 09:06:13 +0200") 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: Ricardo Wurmus Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > Hi Kei, > >> This patch should install p7zip correctly on every architecture >> supported by Guix. Ideally, this should be tested it on each arch for >> the sake of completeness and safety. I've got x86_64 covered so far. :-) > > thank you for this patch! > > I see that you took care of removing non-free parts in a patch and a > build phase. Since =E2=80=9Cguix build -S p7zip=E2=80=9D doesn=E2=80=99t= run the build phase > users would still end up with a source archive containing the non-free > parts. The best way is thus to remove things in a snippet. > > In =E2=80=9Cshogun=E2=80=9D from the =E2=80=9Cmachine-learning=E2=80=9D m= odule we remove supporting code > for non-free features in a snippet by cutting out anything between some > ifdef markers, but looking at the patch I see that it wouldn=E2=80=99t be > feasible for p7zip. > Perhaps I can just clear the non-free files and add that to the patch? > About the new configure phase: I think you could avoid copying the > Makefile by using =E2=80=9C#:make-flags=E2=80=9D similar to this: > > #:make-flags > (list (string-append "-f " > ((string-prefix? "x86_64" system) > "makefile.linux_amd64_asm") > =E2=80=A6) > > What do you think? > I've implemented this successfully like so: #:make-flags (list (let ((system ,(or (%current-target-system) (%current-system)))) (string-append "-f " (cond ((string-prefix? "x86_64" system) "makefile.linux_amd64_asm") ((string-prefix? "i686" system) "makefile.linux_x86_asm_gcc_4.X") (else "makefile.linux_any_cpu_gcc_4.X"))))) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXoMJLAAoJEOal7jwZRnoNUNQP/1m5QB3culPMkbJTPKs+VIg7 dj0jD/Jh5i9YHsn/NQMvxZTlesaF/8eXC3A8JV0KFwKaNnrW7QaZSMjaW9+mH8Z5 iDxIjJdpRbq07pAAk4x4SvuKXY716QHVEBW9rOBPb6/SPdGtIjwj0HplQwbMyN21 ULneU2xBXtGBnLst9kvozg+0h5r50ShTSq3shraWvBvr+P+aujIXstby42XSxcaM rJC1cnluVFKw0tjLSwMJ3sbvsT1CARfI3xw0wUyOWb7P7eIHfCfsDr6CXMd6aytA DSnz46c4an4f9S4LQ9eGCuS4zSDafpNfrLbPdYCwNuD14LecSqElMKKFMDC4rotX KcLKBPO38hW8J50OLQltoXEG1gn3KA+GyqT1PEMqJQiRvbEttV0+FPldxGFInr2j BKvCV3dD2uZRJZdTWmxSP+3Zkp2HRNiXR3m/H2E7jiCghMRit+V+B1Gi9I6nnJAF z1xnbJgRlE+jSFWMOEwnip8tuVhX/3UzUMQRf07NNN6aRRxqKMxV0dITNqD+jrks PQauNx4tEGJ1iJB4ceglVvpKLQXafYDeTrtcP+WZRPX4oa4EsEquP1WH7CT+mlhs Zu2tt9LgCiI7qw3YiNs6oYt/ETc/Ul4FjKA6WS4u4xU8BE1GfdUapuLlAXVtiFKW dFgHjUwsUkDTT5G8iH2T =+yzo -----END PGP SIGNATURE----- --=-=-=--