From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: Re: [PATCH] gnu: procps: Make procps build on non Linux systems. Date: Tue, 3 May 2016 17:58:07 +0300 Message-ID: <1a2eb28f-bd13-f40b-e02e-758b2d740b4b@gmail.com> References: <56b93557-6c80-f1d6-5978-cad718674a14@gmail.com> <87k2jigc2q.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9A44A20C55F2C2EAC854FFB6" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axbmt-00028d-DA for guix-devel@gnu.org; Tue, 03 May 2016 10:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axbme-0000T3-Ij for guix-devel@gnu.org; Tue, 03 May 2016 10:58:51 -0400 In-Reply-To: <87k2jigc2q.fsf@gnu.org> 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: =?UTF-8?Q?Ludovic_Court=c3=a8s?= Cc: guix-devel@gnu.org This is a multi-part message in MIME format. --------------9A44A20C55F2C2EAC854FFB6 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit It seems upstream commit aa9bd38d0a6fe53aff7f78fb2d9f61e55677c7b5 fixed the issue. I updated the patch to use that. Manolis --------------9A44A20C55F2C2EAC854FFB6 Content-Type: text/x-patch; name="0001-gnu-procps-Make-procps-build-on-non-Linux-systems.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-procps-Make-procps-build-on-non-Linux-systems.patch" =46rom 49daecfda965fab7b528b4333ef864a4681ac470 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. * 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 | 37 +++++++++++++++++++++++= ++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/procps-non-linux.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08698cc..2238506 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -672,6 +672,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/packages/p= atches/procps-non-linux.patch new file mode 100644 index 0000000..7a64386 --- /dev/null +++ b/gnu/packages/patches/procps-non-linux.patch @@ -0,0 +1,37 @@ +From aa9bd38d0a6fe53aff7f78fb2d9f61e55677c7b5 Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Sun, 17 Apr 2016 09:09:41 +1000 +Subject: [PATCH] tests: Conditionally add prctl to test process + +prctl was already bypassed on Cygwin systems. This extends to +non-Linux systems such as kFreeBSD and Hurd. + +--- + lib/test_process.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/test_process.c b/lib/test_process.c +index 6e652ed..6a4776c 100644 +--- a/lib/test_process.c ++++ b/lib/test_process.c +@@ -21,7 +21,7 @@ + #include + #include + #include +-#ifndef __CYGWIN__ ++#ifdef __linux__ + #include + #endif + #include "c.h" +@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) + sigaction(SIGUSR1, &signal_action, NULL); + sigaction(SIGUSR2, &signal_action, NULL); +=20 +-#ifndef __CYGWIN__ ++#ifdef __linux__ + /* set process name */ + prctl(PR_SET_NAME, MY_NAME, NULL, NULL, NULL); + #endif +--=20 +2.8.2 + --=20 2.8.2 --------------9A44A20C55F2C2EAC854FFB6--