From 5d4fd2671aaadc5b0b7e0c331fa5e2a1d7e5c4d8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2012 01:29:56 +0100 Subject: distro: make-bootstrap: Have libc's functions search for `sh' in $PATH. * distro/packages/make-bootstrap.scm (%glibc-with-relocatable-system, %standard-inputs-with-relocatable-glibc): New variables. (%static-inputs)[gawk]: Apply `gawk-shell.patch'. [finalize]: New procedure. Build all the packages against %STANDARD-INPUTS-WITH-RELOCATABLE-GLIBC. (%glibc-stripped): Inherit from %GLIBC-WITH-RELOCATABLE-SYSTEM. (%gcc-static, %guile-static): Build against %STANDARD-INPUTS-WITH-RELOCATABLE-GLIBC. * distro/packages/patches/gawk-shell.patch, distro/packages/patches/glibc-bootstrap-system.patch: New files. * Makefile.am (dist_patch_DATA): Add them. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0b59f8901c..f256e47995 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,9 @@ dist_patch_DATA = \ distro/packages/patches/cpio-gets-undeclared.patch \ distro/packages/patches/diffutils-gets-undeclared.patch \ distro/packages/patches/flex-bison-tests.patch \ + distro/packages/patches/gawk-shell.patch \ distro/packages/patches/gettext-gets-undeclared.patch \ + distro/packages/patches/glibc-bootstrap-system.patch \ distro/packages/patches/glibc-no-ld-so-cache.patch \ distro/packages/patches/guile-1.8-cpp-4.5.patch \ distro/packages/patches/guile-default-utf8.patch \ -- cgit v1.2.3 From 0f0995521393b9ec1733de3475bf74c89732e556 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2012 01:33:29 +0100 Subject: distro: Update bootstrap binaries. Use bootstrap binaries that were generated with the `make-bootstrap' changes introduced in previous commit. * Makefile.am (nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA): Change Guile tarball name. (distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): New targets. (distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz, distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz): Remove. * build-aux/download.scm (file-name->uri): Use "20121219" directory. * distro/packages/bootstrap.scm (%bootstrap-guile): Update file name. (%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Update directory name and hashes. --- Makefile.am | 12 ++++++------ build-aux/download.scm | 2 +- distro/packages/bootstrap.scm | 24 ++++++++++++------------ 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index f256e47995..0f58d09d8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,9 +142,9 @@ dist_bootstrap_i686_linux_DATA = \ # Big bootstrap binaries are not included in the tarball. Instead, they # are downloaded. nodist_bootstrap_x86_64_linux_DATA = \ - distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz + distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz nodist_bootstrap_i686_linux_DATA = \ - distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz + distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz # Those files must remain executable, so they remain executable once # imported into the store. @@ -161,12 +161,12 @@ DOWNLOAD_FILE = \ $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \ "$(top_srcdir)/build-aux/download.scm" -distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz: +distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "0467a82cbe4136f60a79eb4176011bf88cf28ea19c9ad9defa365811ff8e11cf" -distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz: + $(DOWNLOAD_FILE) "$@" "953fbcc8db6e310626be79b67319cf4141dc23b296447952a99d95425b3a4dc1" +distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "93b537766dfab3ad287143523751e3ec02dd32d3ccaf88ad2d31c63158f342ee" + $(DOWNLOAD_FILE) "$@" "45d1f9bfb9e4531a8f1c5a105f7ab094cd481b8a179ccc63cbabb73ce6b8437f" nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm diff --git a/build-aux/download.scm b/build-aux/download.scm index 4c1a1a6e5d..f5d23f2701 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -35,7 +35,7 @@ (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - "/20121115/" basename))))) + "/20121219/" basename))))) (match (command-line) ((_ file expected-hash) diff --git a/distro/packages/bootstrap.scm b/distro/packages/bootstrap.scm index 6dc9c3d965..222f087372 100644 --- a/distro/packages/bootstrap.scm +++ b/distro/packages/bootstrap.scm @@ -167,7 +167,7 @@ check whether everything is alright." (xz (->store "xz")) (mkdir (->store "mkdir")) (bash (->store "bash")) - (guile (->store "guile-bootstrap-2.0.6.tar.xz")) + (guile (->store "guile-2.0.7.tar.xz")) (builder (add-text-to-store store "build-bootstrap-guile.sh" @@ -205,15 +205,15 @@ $out/bin/guile --version~%" (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121115/static-binaries.tar.xz")) + system "/20121219/static-binaries.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "0azisn8l2b3cvgni9k0ahzsxs5cxrj0hmf38zgpq3k6pggk3zbfm")) + "1vvdr1hfbjxlincpgfwhz9l4mbrjf502bv5nivapk5b2d3xxfyvv")) ("i686-linux" (base32 - "16v60frbh0naccanwxcxz0z3444dd8salbg8p7cp7vwz8245nhfk")))))) + "18ky02ifa0w5afyil04fh5whlsqdw0h8kn2fkibfhwfsm5q9d5fx")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -224,7 +224,7 @@ $out/bin/guile --version~%" (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121115/binutils-2.22.tar.xz")) + system "/20121219/binutils-2.22.tar.xz")) (sha256 (match system ("x86_64-linux" @@ -232,7 +232,7 @@ $out/bin/guile --version~%" "0ms6i035v40n7mhi91n4b8ivwv2qni3mcd5dj9sj9qmvgqb50r84")) ("i686-linux" (base32 - "193x62ach4l4x16rbzglrqa1d0a825z2as6czdiv9xjiizmcr0ad")))))) + "16yr3jxqjvd979vvpikfn4rl9fqrbcs5viwd2r8xzf5bakc2mq9p")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -277,15 +277,15 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121115/glibc-2.16.0.tar.xz")) + "/20121219/glibc-2.16.0.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1cz587p3scrrx0zgqnmp4nnfj0vvf01zdqdgkz445dnbfh64nl0v")) + "1mqpb2sxfa5whdq0adyrgg7j3ci5v4d42wna8hg4j3dbcr5b2vpi")) ("i686-linux" (base32 - "0vzybz1577vflm0p0zg1slqj32carj5102b45k7iskkj46viy14z")))))))))) + "03wb29srsdswc775ppzwllys0dqyy235shm1n64jl6njw4l7c5x6")))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f))) @@ -348,15 +348,15 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121115/gcc-4.7.2.tar.xz")) + "/20121219/gcc-4.7.2.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "0fg65i2qcym8ls5ig3g1cc9ida5cxwwsd6zi95xi1d8dnfrja4zz")) + "1k374q9v1bph8605sirzmaxnawbddahpgq8d99x1527gj5n2xws1")) ("i686-linux" (base32 - "01hlz98qmc8yhqrxqajpg5kbkhpvqq6wjnbfvplys32n895avzxg")))))))))) + "040jkqkh0qyva5z6gy4d95khhhvsw4vp8x3l818gpi6hfknwb9l8")))))))))) (synopsis "Bootstrap binaries of the GNU Compiler Collection") (description #f) (home-page #f))) -- cgit v1.2.3 From f9975b5a49274e465ea29a5eeb83c4b51bc1f5da Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 29 Dec 2012 23:49:55 +0100 Subject: distro: Add OpenSSL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * distro/packages/openssl.scm: New file. `patch-tests' phase added by Ludovic Courtès. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + distro/packages/openssl.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 distro/packages/openssl.scm (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0f58d09d8b..2dca557b7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,6 +78,7 @@ MODULES = \ distro/packages/nano.scm \ distro/packages/ncurses.scm \ distro/packages/nettle.scm \ + distro/packages/openssl.scm \ distro/packages/perl.scm \ distro/packages/pkg-config.scm \ distro/packages/pth.scm \ diff --git a/distro/packages/openssl.scm b/distro/packages/openssl.scm new file mode 100644 index 0000000000..5ea9ace4f9 --- /dev/null +++ b/distro/packages/openssl.scm @@ -0,0 +1,65 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Andreas Enge +;;; +;;; This file is part of Guix. +;;; +;;; Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with Guix. If not, see . + +(define-module (distro packages openssl) + #:use-module (distro) + #:use-module (distro packages perl) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public openssl + (package + (name "openssl") + (version "1.0.1c") + (source (origin + (method url-fetch) + (uri (string-append "ftp://ftp.openssl.org/source/openssl-" version + ".tar.gz")) + (sha256 (base32 + "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl))) + (arguments + (lambda (system) + `(#:parallel-build? #f + #:parallel-tests? #f + #:test-target "test" + #:phases + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? + (system* "./config" (string-append "--prefix=" out))))) + (alist-cons-before + 'patch-source-shebangs 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* (find-files "test" ".*") + (("/bin/sh") + (string-append bash "/bin/bash")) + (("/bin/rm") + "rm")))) + %standard-phases))))) + (synopsis "OpenSSL, an SSL/TLS implementation") + (description + "OpenSSL is an implementation of SSL/TLS") + (license openssl) + (home-page "http://www.openssl.org/"))) -- cgit v1.2.3 From 79580eb698d07e4b21334ddfbcbcf620d27b5e41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 6 Jan 2013 01:16:14 +0100 Subject: distro: Update bootstrap binaries to an nscd-less libc. Update bootstrap binaries following changes in commit d3b5972 ("Build glibc without nscd, and with static NSS modules.") * Makefile.am (distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Update hashes. * build-aux/download.scm (file-name->uri): Update URL. * distro/packages/bootstrap.scm (%bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Update URLs and hashes. --- Makefile.am | 4 ++-- build-aux/download.scm | 4 ++-- distro/packages/bootstrap.scm | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2dca557b7a..41337fd272 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,10 +164,10 @@ DOWNLOAD_FILE = \ distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "953fbcc8db6e310626be79b67319cf4141dc23b296447952a99d95425b3a4dc1" + $(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c" distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "45d1f9bfb9e4531a8f1c5a105f7ab094cd481b8a179ccc63cbabb73ce6b8437f" + $(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c" nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm diff --git a/build-aux/download.scm b/build-aux/download.scm index f5d23f2701..aad4fe3c76 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -1,5 +1,5 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright (C) 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of Guix. ;;; @@ -35,7 +35,7 @@ (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - "/20121219/" basename))))) + "/20130105/" basename))))) (match (command-line) ((_ file expected-hash) diff --git a/distro/packages/bootstrap.scm b/distro/packages/bootstrap.scm index 222f087372..2d35d3cdce 100644 --- a/distro/packages/bootstrap.scm +++ b/distro/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright (C) 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of Guix. ;;; @@ -205,15 +205,15 @@ $out/bin/guile --version~%" (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121219/static-binaries.tar.xz")) + system "/20130105/static-binaries.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1vvdr1hfbjxlincpgfwhz9l4mbrjf502bv5nivapk5b2d3xxfyvv")) + "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) ("i686-linux" (base32 - "18ky02ifa0w5afyil04fh5whlsqdw0h8kn2fkibfhwfsm5q9d5fx")))))) + "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -224,15 +224,15 @@ $out/bin/guile --version~%" (method url-fetch) (uri (string-append %bootstrap-base-url "/" - system "/20121219/binutils-2.22.tar.xz")) + system "/20130105/binutils-2.22.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "0ms6i035v40n7mhi91n4b8ivwv2qni3mcd5dj9sj9qmvgqb50r84")) + "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) ("i686-linux" (base32 - "16yr3jxqjvd979vvpikfn4rl9fqrbcs5viwd2r8xzf5bakc2mq9p")))))) + "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -277,15 +277,15 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121219/glibc-2.16.0.tar.xz")) + "/20130105/glibc-2.17.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1mqpb2sxfa5whdq0adyrgg7j3ci5v4d42wna8hg4j3dbcr5b2vpi")) + "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) ("i686-linux" (base32 - "03wb29srsdswc775ppzwllys0dqyy235shm1n64jl6njw4l7c5x6")))))))))) + "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f))) @@ -348,15 +348,15 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (origin (method url-fetch) (uri (string-append %bootstrap-base-url "/" system - "/20121219/gcc-4.7.2.tar.xz")) + "/20130105/gcc-4.7.2.tar.xz")) (sha256 (match system ("x86_64-linux" (base32 - "1k374q9v1bph8605sirzmaxnawbddahpgq8d99x1527gj5n2xws1")) + "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) ("i686-linux" (base32 - "040jkqkh0qyva5z6gy4d95khhhvsw4vp8x3l818gpi6hfknwb9l8")))))))))) + "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")))))))))) (synopsis "Bootstrap binaries of the GNU Compiler Collection") (description #f) (home-page #f))) -- cgit v1.2.3