From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH 3/5] gnu: avr-libc: Fix build. Date: Thu, 14 Apr 2016 09:17:02 -0400 Message-ID: <1460639824-9976-4-git-send-email-dthompson2@worcester.edu> References: <1460639824-9976-1-git-send-email-dthompson2@worcester.edu> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqh91-0000Ub-PB for guix-devel@gnu.org; Thu, 14 Apr 2016 09:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqh8x-0001s1-Mb for guix-devel@gnu.org; Thu, 14 Apr 2016 09:17:15 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:34801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqh8x-0001rv-HN for guix-devel@gnu.org; Thu, 14 Apr 2016 09:17:11 -0400 Received: by mail-qg0-x234.google.com with SMTP id c6so62409853qga.1 for ; Thu, 14 Apr 2016 06:17:11 -0700 (PDT) In-Reply-To: <1460639824-9976-1-git-send-email-dthompson2@worcester.edu> 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: guix-devel@gnu.org * gnu/packages/avr.scm (avr-libc): Update to 2.0.0. [native-inputs]: Use new avr-gcc and avr-binutils. [arguments]: Add phase to unset C_INCLUDE_PATH. --- gnu/packages/avr.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 0ec115e..81ca162 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -70,28 +70,38 @@ (define-public avr-libc (package (name "avr-libc") - (version "1.8.1") + (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://savannah//avr-libc/avr-libc-" - version ".tar.bz2")) + (uri (string-append "mirror://savannah//avr-libc/avr-libc-" + version ".tar.bz2")) (sha256 (base32 - "0sd9qkvhmk9av4g1f8dsjwc309hf1g0731bhvicnjb3b3d42l1n3")))) + "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj")))) (build-system gnu-build-system) (arguments - `(#:out-of-source? #t - #:configure-flags '("--host=avr"))) - - (native-inputs `(("cross-binutils" ,(cross-binutils "avr")) - ("cross-gcc" ,xgcc-avr))) + '(#:out-of-source? #t + #:configure-flags '("--host=avr") + #:phases + (modify-phases %standard-phases + (add-before 'unpack 'fix-cpath + (lambda _ + ;; C_INCLUDE_PATH poses issues for cross-building, leading to + ;; failures when building avr-libc on 64-bit systems. Simply + ;; unsetting it allows the build to succeed because it doesn't + ;; try to use any of the native system's headers. + (unsetenv "C_INCLUDE_PATH") + #t))))) + (native-inputs `(("avr-binutils" ,avr-binutils) + ("avr-gcc" ,avr-gcc))) (home-page "http://www.nongnu.org/avr-libc/") (synopsis "The AVR C Library") (description "AVR Libc is a project whose goal is to provide a high quality C library for use with GCC on Atmel AVR microcontrollers.") - (license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) + (license + (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) + (define-public microscheme (package -- 2.7.3