From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: Re: [PATCH] gnu: procps: Make procps build on non Linux systems. Date: Thu, 28 Apr 2016 11:55:17 +0200 Message-ID: <20160428095517.GA6984@jocasta.intra> References: <56b93557-6c80-f1d6-5978-cad718674a14@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="n8g4imXOkfNTN/H1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avifO-00055e-KJ for guix-devel@gnu.org; Thu, 28 Apr 2016 05:55:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avifL-0001kK-4F for guix-devel@gnu.org; Thu, 28 Apr 2016 05:55:26 -0400 Received: from de.cellform.com ([88.217.224.109]:46597 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avifK-0001k3-NC for guix-devel@gnu.org; Thu, 28 Apr 2016 05:55:23 -0400 Content-Disposition: inline In-Reply-To: <56b93557-6c80-f1d6-5978-cad718674a14@gmail.com> 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: Manolis Ragkousis Cc: guix-devel@gnu.org --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Can upstream be persauded to apply it? J' On Thu, Apr 28, 2016 at 11:30:09AM +0300, Manolis Ragkousis wrote: With this patch procps can be built on the Hurd. =20 Manolis From 00c2d2ec11a75e3d74704150488e73ee7c8c6fe8 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Wed, 27 Apr 2016 23:33:56 +0300 Subject: [PATCH] gnu: procps: Make procps build on non Linux systems. =20 * gnu/packages/patches/procps-non-linux.patch.patch: New patch. * gnu/packages/linux.scm (procps)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 4 +++- gnu/packages/patches/procps-non-linux.patch | 23 ++++++++++++++++++++= +++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/procps-non-linux.patch =20 diff --git a/gnu/local.mk b/gnu/local.mk index 80017ea..036e649 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -673,6 +673,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/polkit-drop-test.patch \ gnu/packages/patches/portaudio-audacity-compat.patch \ gnu/packages/patches/procmail-ambiguous-getline-debian.patch \ + gnu/packages/patches/procps-non-linux.patch \ gnu/packages/patches/pt-scotch-build-parallelism.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a26e641..f3c04cd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -523,7 +523,9 @@ block devices, UUIDs, TTYs, and many other tools.") "procps-ng-" version ".tar.xz")) (sha256 (base32 - "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9= ")))) + "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9= ")) + (patches + (list (search-patch "procps-non-linux.patch"))))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) diff --git a/gnu/packages/patches/procps-non-linux.patch b/gnu/package= s/patches/procps-non-linux.patch new file mode 100644 index 0000000..dd21c82 --- /dev/null +++ b/gnu/packages/patches/procps-non-linux.patch @@ -0,0 +1,23 @@ +--- a/lib/test_process.c ++++ b/lib/test_process.c +@@ -21,7 +21,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + #include "c.h" +=20 + #define DEFAULT_SLEEPTIME 300 +@@ -78,8 +80,10 @@ + sigaction(SIGUSR1, &signal_action, NULL); + sigaction(SIGUSR2, &signal_action, NULL); +=20 ++#ifdef __linux__ + /* set process name */ + prctl(PR_SET_NAME, MY_NAME, NULL, NULL, NULL); ++#endif +=20 + while (sleep_time > 0) { + sleep_time =3D sleep(sleep_time); \ No newline at end of file --=20 2.8.0 =20 --=20 Avoid eavesdropping. Send strong encryted email. PGP Public key ID: 1024D/2DE827B3=20 fingerprint =3D 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. --n8g4imXOkfNTN/H1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlch3gUACgkQimdxnC3oJ7P2KgCfa7JSOmLM+FJ8I6k/1yPbuNjA fK0AnRrep18z4Xsi82R5MtRAojPtHC+P =oSAr -----END PGP SIGNATURE----- --n8g4imXOkfNTN/H1--