From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvo1S-000297-7l for guix-patches@gnu.org; Wed, 05 Apr 2017 12:43:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvo1P-0007gT-Hh for guix-patches@gnu.org; Wed, 05 Apr 2017 12:43:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvo1P-0007gO-EN for guix-patches@gnu.org; Wed, 05 Apr 2017 12:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cvo1P-0003TB-7x for guix-patches@gnu.org; Wed, 05 Apr 2017 12:43:03 -0400 Subject: bug#26373: [PATCH 4/6] import cran: Check if pkg-config is needed. Resent-Message-ID: From: Ricardo Wurmus Date: Wed, 5 Apr 2017 18:42:08 +0200 Message-Id: <20170405164210.29428-4-rekado@elephly.net> In-Reply-To: <20170405164210.29428-1-rekado@elephly.net> References: <20170405164210.29428-1-rekado@elephly.net> 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: 26373@debbugs.gnu.org Cc: Ricardo Wurmus * guix/import/cran.scm (needs-pkg-config?): New procedure. (description->package): Use it. --- guix/import/cran.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index be3b678cd..423835637 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -229,6 +229,13 @@ contain a zlib linker flag." tarball "-lz" "*/src/Makevars*" "*/src/configure*" "*/configure*")) +(define (needs-pkg-config? tarball) + "Return #T if any of the Makevars files in the src directory of the TARBALL +reference the pkg-config tool." + (tarball-files-match-pattern? + tarball "pkg-config" + "*/src/Makevars*" "*/src/configure*" "*/configure*")) + (define (description->package repository meta) "Return the `package' s-expression for an R package published on REPOSITORY from the alist META, which was derived from the R package's DESCRIPTION file." @@ -278,11 +285,12 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (build-system r-build-system) ,@(maybe-inputs sysdepends) ,@(maybe-inputs (map guix-name propagate) 'propagated-inputs) - ,@(if (needs-fortran? tarball) - `((native-inputs (,'quasiquote - ,(list "gfortran" - (list 'unquote 'gfortran))))) - '()) + ,@(maybe-inputs + `(,@(if (needs-fortran? tarball) + '("gfortran") '()) + ,@(if (needs-pkg-config? tarball) + '("pkg-config") '())) + 'native-inputs) (home-page ,(if (string-null? home-page) (string-append base-url name) home-page)) -- 2.12.2