From cdecf775011498fabb1f484d59b626e0f1ee408c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Oct 2013 22:16:58 +0200 Subject: gnu: tar: Update to 1.17. * gnu/packages/base.scm (tar): Update to 1.17. Remove 'arguments' and 'inputs'. * gnu/packages/patches/tar-gets-undeclared.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove 'tar-gets-undeclared.patch'. --- gnu-system.am | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 37a174cbc..844ba10f6 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -239,7 +239,6 @@ dist_patch_DATA = \ gnu/packages/patches/readline-link-ncurses.patch \ gnu/packages/patches/ripperx-libm.patch \ gnu/packages/patches/scheme48-tests.patch \ - gnu/packages/patches/tar-gets-undeclared.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ gnu/packages/patches/teckit-cstdio.patch \ gnu/packages/patches/valgrind-glibc.patch \ -- cgit v1.3 From ed41d48ef195960d784db0e547d5ff6dcaa9b774 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 16 Oct 2013 16:27:45 +0200 Subject: gnu: make: Update to 4.0, with Guile support. * gnu/packages/base.scm (gnu-make): Update to 4.0. Add Guile as an input. (gnu-make-boot0): Patch 'build.sh' so it does not attempt to build 'guile.c'. (gnu-make-final): New variable. (%final-inputs): Use it. (glibc): Add 'glibc-make-4.0.patch'. * gnu/packages/patches/glibc-make-4.0.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/base.scm | 24 +++++++++++++++++++----- gnu/packages/patches/glibc-make-4.0.patch | 12 ++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/glibc-make-4.0.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 844ba10f6..2397e85a3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -218,6 +218,7 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ + gnu/packages/patches/glibc-make-4.0.patch \ gnu/packages/patches/glibc-no-ld-so-cache.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7cf328a80..8a9cee169 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -276,16 +276,17 @@ functionality beyond that which is outlined in the POSIX standard.") (define-public gnu-make (package (name "make") - (version "3.82") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/make/make-" version ".tar.bz2")) (sha256 (base32 - "0ri98385hsd7li6rh4l5afcq92v8l2lgiaz85wgcfh4w2wzsghg2")) + "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6")) (patches (list (search-patch "make-impure-dirs.patch"))))) (build-system gnu-build-system) + (inputs `(("guile" ,guile-2.0))) (outputs '("out" "debug")) (arguments '(#:phases (alist-cons-before @@ -364,7 +365,8 @@ archives.") "18spla703zav8dq9fw7rbzkyv9qfisxb26p7amg1x3wjh7iy3d1c")) (patches (map search-patch '("glibc-no-ld-so-cache.patch" - "glibc-ldd-x86_64.patch"))))) + "glibc-ldd-x86_64.patch" + "glibc-make-4.0.patch"))))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -560,6 +562,10 @@ and daylight-saving rules.") ((#:phases phases) `(alist-replace 'build (lambda _ + ;; Don't attempt to build 'guile.c' since we don't + ;; have Guile here. + (substitute* "build.sh" + (("guile\\.\\$\\{OBJEXT\\}") "")) (zero? (system* "./build.sh"))) (alist-replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -991,6 +997,14 @@ store.") (current-source-location) #:guile %bootstrap-guile))) +(define-public gnu-make-final + ;; The final GNU Make, which uses the final Guile. + (package-with-bootstrap-guile + (package-with-explicit-inputs gnu-make + `(("guile" ,guile-final) + ,@%boot4-inputs) + (current-source-location)))) + (define-public ld-wrapper ;; The final `ld' wrapper, which uses the final Guile. (package (inherit ld-wrapper-boot3) @@ -1021,8 +1035,8 @@ store.") ("sed" ,sed) ("grep" ,grep) ("findutils" ,findutils) - ("gawk" ,gawk) - ("make" ,gnu-make))) + ("gawk" ,gawk))) + ("make" ,gnu-make-final) ("bash" ,bash-final) ("ld-wrapper" ,ld-wrapper) ("binutils" ,binutils-final) diff --git a/gnu/packages/patches/glibc-make-4.0.patch b/gnu/packages/patches/glibc-make-4.0.patch new file mode 100644 index 000000000..d83de1d33 --- /dev/null +++ b/gnu/packages/patches/glibc-make-4.0.patch @@ -0,0 +1,12 @@ +Allow libc to be compiled with GNU Make 4.0. + +--- glibc-2.18/configure 2013-08-11 00:52:55.000000000 +0200 ++++ glibc-2.18/configure 2013-10-16 16:53:09.000000000 +0200 +@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE... + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -- cgit v1.3 From 2c1ceeacdf00c9fa6b4324b693c9998745f84b1c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Nov 2013 18:08:33 -0500 Subject: gnu: binutils: apply fixes and workarounds for Loongson 2F CPUs. * gnu/packages/patches/binutils-loongson-madd-fix.patch: New file. * gnu/packages/patches/binutils-loongson-workaround.patch: New file. * gnu/packages/base.scm (binutils): Add patches. * gnu-system.am (dist_patch_DATA): Add patches. --- gnu-system.am | 2 + gnu/packages/base.scm | 4 +- .../patches/binutils-loongson-madd-fix.patch | 44 ++++++++++++++++++++++ .../patches/binutils-loongson-workaround.patch | 34 +++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/binutils-loongson-madd-fix.patch create mode 100644 gnu/packages/patches/binutils-loongson-workaround.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index a2377fd6e..5d3b13d2b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -207,6 +207,8 @@ dist_patch_DATA = \ gnu/packages/patches/avahi-localstatedir.patch \ gnu/packages/patches/bigloo-gc-shebangs.patch \ gnu/packages/patches/binutils-ld-new-dtags.patch \ + gnu/packages/patches/binutils-loongson-madd-fix.patch \ + gnu/packages/patches/binutils-loongson-workaround.patch \ gnu/packages/patches/cdparanoia-fpic.patch \ gnu/packages/patches/cmake-fix-tests.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f89d618cd..41e1a8d04 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -321,7 +321,9 @@ change.") (sha256 (base32 "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy")) - (patches (list (search-patch "binutils-ld-new-dtags.patch"))))) + (patches (list (search-patch "binutils-ld-new-dtags.patch") + (search-patch "binutils-loongson-workaround.patch") + (search-patch "binutils-loongson-madd-fix.patch"))))) (build-system gnu-build-system) ;; Split Binutils in several outputs, mostly to avoid collisions in diff --git a/gnu/packages/patches/binutils-loongson-madd-fix.patch b/gnu/packages/patches/binutils-loongson-madd-fix.patch new file mode 100644 index 000000000..364ccd67e --- /dev/null +++ b/gnu/packages/patches/binutils-loongson-madd-fix.patch @@ -0,0 +1,44 @@ +Fix the Loongson 2F specific fused multiply-add instructions on paired singles to +use the encoding recognized by the processor, as opposed to the mistaken english +Loongson 2F documentation. + +Patch by Mark H Weaver . + +--- binutils/opcodes/mips-opc.c.orig 2012-09-04 10:21:10.000000000 -0400 ++++ binutils/opcodes/mips-opc.c 2013-10-06 02:23:33.679983766 -0400 +@@ -931,7 +931,7 @@ + {"madd.s", "D,S,T", 0x72000018, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"madd.ps", "D,R,S,T", 0x4c000026, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"madd.ps", "D,S,T", 0x45600018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"madd.ps", "D,S,T", 0x71600018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"madd.ps", "D,S,T", 0x72c00018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"madd", "s,t", 0x0000001c, 0xfc00ffff, RD_s|RD_t|WR_HILO, 0, L1 }, + {"madd", "s,t", 0x70000000, 0xfc00ffff, RD_s|RD_t|MOD_HILO, 0, I32|N55 }, + {"madd", "s,t", 0x70000000, 0xfc00ffff, RD_s|RD_t|WR_HILO|IS_M, 0, G1 }, +@@ -1041,7 +1041,7 @@ + {"msub.s", "D,S,T", 0x72000019, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"msub.ps", "D,R,S,T", 0x4c00002e, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"msub.ps", "D,S,T", 0x45600019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"msub.ps", "D,S,T", 0x71600019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"msub.ps", "D,S,T", 0x72c00019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"msub", "s,t", 0x0000001e, 0xfc00ffff, RD_s|RD_t|WR_HILO, 0, L1 }, + {"msub", "s,t", 0x70000004, 0xfc00ffff, RD_s|RD_t|MOD_HILO, 0, I32|N55 }, + {"msub", "7,s,t", 0x70000004, 0xfc00e7ff, MOD_a|RD_s|RD_t, 0, D32 }, +@@ -1157,7 +1157,7 @@ + {"nmadd.s", "D,S,T", 0x7200001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"nmadd.ps","D,R,S,T", 0x4c000036, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"nmadd.ps", "D,S,T", 0x4560001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"nmadd.ps", "D,S,T", 0x7160001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"nmadd.ps", "D,S,T", 0x72c0001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"nmsub.d", "D,R,S,T", 0x4c000039, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I4_33 }, + {"nmsub.d", "D,S,T", 0x4620001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, + {"nmsub.d", "D,S,T", 0x7220001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, +@@ -1166,7 +1166,7 @@ + {"nmsub.s", "D,S,T", 0x7200001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"nmsub.ps","D,R,S,T", 0x4c00003e, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"nmsub.ps", "D,S,T", 0x4560001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"nmsub.ps", "D,S,T", 0x7160001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"nmsub.ps", "D,S,T", 0x72c0001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + /* nop is at the start of the table. */ + {"nor", "d,v,t", 0x00000027, 0xfc0007ff, WR_d|RD_s|RD_t, 0, I1 }, + {"nor", "t,r,I", 0, (int) M_NOR_I, INSN_MACRO, 0, I1 }, diff --git a/gnu/packages/patches/binutils-loongson-workaround.patch b/gnu/packages/patches/binutils-loongson-workaround.patch new file mode 100644 index 000000000..f43572a53 --- /dev/null +++ b/gnu/packages/patches/binutils-loongson-workaround.patch @@ -0,0 +1,34 @@ +Enable the workaround for the Loongson 2F bug by default. + +Patch by Mark H Weaver . + +--- binutils/gas/config/tc-mips.c.orig 2012-09-04 10:21:03.000000000 -0400 ++++ binutils/gas/config/tc-mips.c 2013-10-06 02:23:21.651983768 -0400 +@@ -910,10 +910,10 @@ + }; + + /* ...likewise -mfix-loongson2f-jump. */ +-static bfd_boolean mips_fix_loongson2f_jump; ++static bfd_boolean mips_fix_loongson2f_jump = FALSE; + + /* ...likewise -mfix-loongson2f-nop. */ +-static bfd_boolean mips_fix_loongson2f_nop; ++static bfd_boolean mips_fix_loongson2f_nop = TRUE; + + /* True if -mfix-loongson2f-nop or -mfix-loongson2f-jump passed. */ + static bfd_boolean mips_fix_loongson2f; +--- binutils/gas/testsuite/gas/mips/mips.exp.orig 2012-09-04 10:17:13.000000000 -0400 ++++ binutils/gas/testsuite/gas/mips/mips.exp 2013-10-06 02:23:21.663983768 -0400 +@@ -91,6 +91,12 @@ + + # Catch because the variable won't be set the first time through. + catch {unset mips_arches} ++ ++ # Disable the loongson2f nop fix by default, because most of the ++ # existing test cases for mips will fail otherwise. ++ global ASFLAGS ++ set old_ASFLAGS "$ASFLAGS" ++ set ASFLAGS "$ASFLAGS -mno-fix-loongson2f-nop" + } + + # mips_arch_create ARCH GPRSIZE EXTENDS PROPS AS_FLAGS OBJDUMP_FLAGS \ -- cgit v1.3 From bf2cc1e5d14df7d8ff0c9456798d48fba65de317 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Nov 2013 18:15:00 -0500 Subject: gnu: libtool: skip a test that fails on MIPS N32. * gnu/packages/patches/libtool-skip-tests-for-mips.patch: New file. * gnu/packages/autotools.scm (libtool): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/autotools.scm | 4 +++- gnu/packages/patches/libtool-skip-tests-for-mips.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtool-skip-tests-for-mips.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 5d3b13d2b..6c98ca31a 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -238,6 +238,7 @@ dist_patch_DATA = \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libtool-skip-tests.patch \ + gnu/packages/patches/libtool-skip-tests-for-mips.patch \ gnu/packages/patches/m4-gets-undeclared.patch \ gnu/packages/patches/m4-readlink-EINVAL.patch \ gnu/packages/patches/make-impure-dirs.patch \ diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index bcab4e37c..90f80872e 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -217,7 +217,9 @@ simplifying the entire process for the developer.") (sha256 (base32 "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk")) - (patches (list (search-patch "libtool-skip-tests.patch"))))) + (patches + (list (search-patch "libtool-skip-tests.patch") + (search-patch "libtool-skip-tests-for-mips.patch"))))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4) ("perl" ,perl))) diff --git a/gnu/packages/patches/libtool-skip-tests-for-mips.patch b/gnu/packages/patches/libtool-skip-tests-for-mips.patch new file mode 100644 index 000000000..36587d23c --- /dev/null +++ b/gnu/packages/patches/libtool-skip-tests-for-mips.patch @@ -0,0 +1,12 @@ +TEMPORARY HACK: Disable a test that fails on MIPS. + +--- libtool/Makefile.in.orig 2011-10-17 06:18:55.000000000 -0400 ++++ libtool/Makefile.in 2013-10-12 20:41:50.669067382 -0400 +@@ -890,7 +890,6 @@ + tests/demo-pic-make.test \ + tests/demo-pic-exec.test \ + tests/demo-nopic.test \ +- tests/demo-nopic-make.test \ + tests/demo-nopic-exec.test \ + tests/cdemo-shared.test \ + tests/cdemo-shared-make.test \ -- cgit v1.3 From 1602fcea18879f855f906cf21bb6ee849cbf62c2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Nov 2013 18:20:00 -0500 Subject: gnu: libffi: fix handling of uint32_t arguments on MIPS N32. * gnu/packages/patches/libffi-mips-n32-fix.patch: New file. * gnu/packages/libffi.scm (libffi): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/libffi.scm | 4 +++- gnu/packages/patches/libffi-mips-n32-fix.patch | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libffi-mips-n32-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 6c98ca31a..80d9438ad 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -237,6 +237,7 @@ dist_patch_DATA = \ gnu/packages/patches/guile-relocatable.patch \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ + gnu/packages/patches/libffi-mips-n32-fix.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/libtool-skip-tests-for-mips.patch \ gnu/packages/patches/m4-gets-undeclared.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index e4a276127..d1a834d9c 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libffi) + #:use-module (gnu packages) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -46,7 +47,8 @@ name "-" version ".tar.gz")) (sha256 (base32 - "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x")))) + "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x")) + (patches (list (search-patch "libffi-mips-n32-fix.patch"))))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 ftw) (srfi srfi-26)) diff --git a/gnu/packages/patches/libffi-mips-n32-fix.patch b/gnu/packages/patches/libffi-mips-n32-fix.patch new file mode 100644 index 000000000..87ec48f88 --- /dev/null +++ b/gnu/packages/patches/libffi-mips-n32-fix.patch @@ -0,0 +1,21 @@ +Fix handling of uint32_t arguments on the MIPS N32 ABI. + +Patch by Mark H Weaver . + +--- libffi/src/mips/ffi.c.orig 2013-03-16 07:19:39.000000000 -0400 ++++ libffi/src/mips/ffi.c 2013-10-22 01:11:03.111985247 -0400 +@@ -170,7 +170,14 @@ + break; + + case FFI_TYPE_UINT32: ++#ifdef FFI_MIPS_N32 ++ /* The N32 ABI requires that 32-bit integers ++ be sign-extended to 64-bits, regardless of ++ whether they are signed or unsigned. */ ++ *(ffi_arg *)argp = *(SINT32 *)(* p_argv); ++#else + *(ffi_arg *)argp = *(UINT32 *)(* p_argv); ++#endif + break; + + /* This can only happen with 64bit slots. */ -- cgit v1.3 From b20441f22887a09e52d843e9b44bd7668c8a468c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Nov 2013 18:23:38 -0500 Subject: gnu: gdb: Fix opcode table for Loongson fused multiply-add. * gnu/packages/patches/gdb-loongson-madd-fix.patch: New file. * gnu/packages/gdb.scm (gdb): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/gdb.scm | 4 ++- gnu/packages/patches/gdb-loongson-madd-fix.patch | 44 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gdb-loongson-madd-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 80d9438ad..548f076c4 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -220,6 +220,7 @@ dist_patch_DATA = \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ + gnu/packages/patches/gdb-loongson-madd-fix.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ gnu/packages/patches/glib-tests-newnet.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 09e00aaeb..2033c628d 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gdb) + #:use-module (gnu packages) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) #:use-module (gnu packages dejagnu) @@ -39,7 +40,8 @@ version ".tar.bz2")) (sha256 (base32 - "1r32s6vqgskw6pz9pmp41b8injd51c4bbxr6ifdpyid52j5a7pz3")))) + "1r32s6vqgskw6pz9pmp41b8injd51c4bbxr6ifdpyid52j5a7pz3")) + (patches (list (search-patch "gdb-loongson-madd-fix.patch"))))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-after diff --git a/gnu/packages/patches/gdb-loongson-madd-fix.patch b/gnu/packages/patches/gdb-loongson-madd-fix.patch new file mode 100644 index 000000000..0d50dd2dd --- /dev/null +++ b/gnu/packages/patches/gdb-loongson-madd-fix.patch @@ -0,0 +1,44 @@ +Fix the Loongson 2F specific fused multiply-add instructions on paired singles to +use the encoding recognized by the processor, as opposed to the mistaken english +Loongson 2F documentation. + +Patch by Mark H Weaver . + +--- gdb/opcodes/mips-opc.c.orig 2013-02-09 05:24:18.000000000 -0500 ++++ gdb/opcodes/mips-opc.c 2013-10-27 23:35:20.191997541 -0400 +@@ -956,7 +956,7 @@ + {"madd.s", "D,S,T", 0x4600001c, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, EE }, + {"madd.ps", "D,R,S,T", 0x4c000026, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"madd.ps", "D,S,T", 0x45600018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"madd.ps", "D,S,T", 0x71600018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"madd.ps", "D,S,T", 0x72c00018, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"madd", "s,t", 0x0000001c, 0xfc00ffff, RD_s|RD_t|WR_HILO, 0, L1 }, + {"madd", "s,t", 0x70000000, 0xfc00ffff, RD_s|RD_t|MOD_HILO, 0, I32|N55 }, + {"madd", "s,t", 0x70000000, 0xfc00ffff, RD_s|RD_t|WR_HILO|IS_M, 0, G1 }, +@@ -1084,7 +1084,7 @@ + {"msub.s", "D,S,T", 0x4600001d, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, EE }, + {"msub.ps", "D,R,S,T", 0x4c00002e, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"msub.ps", "D,S,T", 0x45600019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"msub.ps", "D,S,T", 0x71600019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"msub.ps", "D,S,T", 0x72c00019, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"msub", "s,t", 0x0000001e, 0xfc00ffff, RD_s|RD_t|WR_HILO, 0, L1 }, + {"msub", "s,t", 0x70000004, 0xfc00ffff, RD_s|RD_t|MOD_HILO, 0, I32|N55 }, + {"msub", "7,s,t", 0x70000004, 0xfc00e7ff, MOD_a|RD_s|RD_t, 0, D32 }, +@@ -1218,7 +1218,7 @@ + {"nmadd.s", "D,S,T", 0x7200001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"nmadd.ps","D,R,S,T", 0x4c000036, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"nmadd.ps", "D,S,T", 0x4560001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"nmadd.ps", "D,S,T", 0x7160001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"nmadd.ps", "D,S,T", 0x72c0001a, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + {"nmsub.d", "D,R,S,T", 0x4c000039, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I4_33 }, + {"nmsub.d", "D,S,T", 0x4620001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, + {"nmsub.d", "D,S,T", 0x7220001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, +@@ -1227,7 +1227,7 @@ + {"nmsub.s", "D,S,T", 0x7200001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_S, 0, IL2F }, + {"nmsub.ps","D,R,S,T", 0x4c00003e, 0xfc00003f, RD_R|RD_S|RD_T|WR_D|FP_D, 0, I5_33 }, + {"nmsub.ps", "D,S,T", 0x4560001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2E }, +-{"nmsub.ps", "D,S,T", 0x7160001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, ++{"nmsub.ps", "D,S,T", 0x72c0001b, 0xffe0003f, RD_S|RD_T|WR_D|FP_D, 0, IL2F }, + /* nop is at the start of the table. */ + {"nor", "d,v,t", 0x00000027, 0xfc0007ff, WR_d|RD_s|RD_t, 0, I1 }, + {"nor", "t,r,I", 0, (int) M_NOR_I, INSN_MACRO, 0, I1 }, -- cgit v1.3 From bcd94e192a8459107ba43f03694fc82a35af6447 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 3 Nov 2013 18:28:03 -0500 Subject: gnu: alsa-lib: fix atomic op declarations for MIPS. * gnu/packages/patches/alsa-lib-mips-atomic-fix.patch: New file. * gnu/packages/linux.scm (alsa-lib): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/linux.scm | 3 +- .../patches/alsa-lib-mips-atomic-fix.patch | 42 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/alsa-lib-mips-atomic-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 548f076c4..6f2b4d12c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -202,6 +202,7 @@ GNU_SYSTEM_MODULES = \ patchdir = $(guilemoduledir)/gnu/packages/patches dist_patch_DATA = \ + gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \ gnu/packages/patches/apr-skip-getservbyname-test.patch \ gnu/packages/patches/automake-skip-amhello-tests.patch \ gnu/packages/patches/avahi-localstatedir.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cd1c92162..eab428032 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -473,7 +473,8 @@ trace of all the system calls made by a another process/program.") version ".tar.bz2")) (sha256 (base32 - "0fx057746dj7rjdi0jnvx2m9b0y1lgdkh1hks87d8w32xyihf3k9")))) + "0fx057746dj7rjdi0jnvx2m9b0y1lgdkh1hks87d8w32xyihf3k9")) + (patches (list (search-patch "alsa-lib-mips-atomic-fix.patch"))))) (build-system gnu-build-system) (home-page "http://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") diff --git a/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch b/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch new file mode 100644 index 000000000..8c37bd3ac --- /dev/null +++ b/gnu/packages/patches/alsa-lib-mips-atomic-fix.patch @@ -0,0 +1,42 @@ +Fix the declarations of inlined atomic ops for mips. + +This patch was copied from Debian. + +--- alsa-lib/include/iatomic.h.orig 2013-05-21 04:48:28.000000000 -0400 ++++ alsa-lib/include/iatomic.h 2013-10-29 13:01:37.055995968 -0400 +@@ -720,7 +720,7 @@ + * Atomically adds @i to @v. Note that the guaranteed useful range + * of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_add(int i, atomic_t * v) ++static __inline__ void atomic_add(int i, atomic_t * v) + { + unsigned long temp; + +@@ -744,7 +744,7 @@ + * Atomically subtracts @i from @v. Note that the guaranteed + * useful range of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_sub(int i, atomic_t * v) ++static __inline__ void atomic_sub(int i, atomic_t * v) + { + unsigned long temp; + +@@ -763,7 +763,7 @@ + /* + * Same as above, but return the result value + */ +-extern __inline__ int atomic_add_return(int i, atomic_t * v) ++static __inline__ int atomic_add_return(int i, atomic_t * v) + { + unsigned long temp, result; + +@@ -784,7 +784,7 @@ + return result; + } + +-extern __inline__ int atomic_sub_return(int i, atomic_t * v) ++static __inline__ int atomic_sub_return(int i, atomic_t * v) + { + unsigned long temp, result; + -- cgit v1.3 From 46acd054010134eba293c3b978e82edb9ebc21fb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 31 Oct 2013 23:59:00 -0400 Subject: gnu: libtheora: patch ancient config.guess to support mips64. * gnu/packages/patches/libtheora-config-guess.patch: New file. * gnu/packages/oggvorbis.scm (libtheora): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/oggvorbis.scm | 3 +- gnu/packages/patches/libtheora-config-guess.patch | 37 +++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libtheora-config-guess.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 6f2b4d12c..2d9ac98ec 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -240,6 +240,7 @@ dist_patch_DATA = \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libffi-mips-n32-fix.patch \ + gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/libtool-skip-tests-for-mips.patch \ gnu/packages/patches/m4-gets-undeclared.patch \ diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm index 1b1630e1f..e2084b06b 100644 --- a/gnu/packages/oggvorbis.scm +++ b/gnu/packages/oggvorbis.scm @@ -100,7 +100,8 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to version ".tar.xz")) (sha256 (base32 - "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")))) + "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) + (patches (list (search-patch "libtheora-config-guess.patch"))))) (build-system gnu-build-system) (inputs `(("libvorbis" ,libvorbis))) ;; The .pc files refer to libogg. diff --git a/gnu/packages/patches/libtheora-config-guess.patch b/gnu/packages/patches/libtheora-config-guess.patch new file mode 100644 index 000000000..9529ea710 --- /dev/null +++ b/gnu/packages/patches/libtheora-config-guess.patch @@ -0,0 +1,37 @@ +Minimally patch libtheora's ancient config.guess to support mips64. + +--- libtheora/config.guess.orig 2009-02-23 22:50:50.000000000 -0500 ++++ libtheora/config.guess 2013-10-31 23:49:48.155999944 -0400 +@@ -798,25 +798,24 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- rm -f $dummy.c && rmdir $tmpdir +- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit 0; } + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu -- cgit v1.3 From dd863f1f39858bf9d3f1a9de4b4eccc8d3f75d62 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 1 Nov 2013 00:15:16 -0400 Subject: gnu: libmad: Fix MIPS assembler code to work with new GCC. * gnu/packages/patches/libmad-mips-newgcc.patch: New file. * gnu/packages/mp3.scm (libmad): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/mp3.scm | 3 ++- gnu/packages/patches/libmad-mips-newgcc.patch | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libmad-mips-newgcc.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 2d9ac98ec..fe8474476 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -240,6 +240,7 @@ dist_patch_DATA = \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libffi-mips-n32-fix.patch \ + gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/libtool-skip-tests-for-mips.patch \ diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index b604a3629..5f69255d2 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -44,7 +44,8 @@ version ".tar.gz")) (sha256 (base32 - "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv")))) + "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv")) + (patches (list (search-patch "libmad-mips-newgcc.patch"))))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/libmad-mips-newgcc.patch b/gnu/packages/patches/libmad-mips-newgcc.patch new file mode 100644 index 000000000..d22c51255 --- /dev/null +++ b/gnu/packages/patches/libmad-mips-newgcc.patch @@ -0,0 +1,16 @@ +Fix MIPS assembly code to work with newer GCC, where the "=h" +constraint is no longer supported. + +--- libmad/fixed.h.orig 2004-02-16 21:02:03.000000000 -0500 ++++ libmad/fixed.h 2011-10-29 18:47:21.000000000 -0400 +@@ -304,8 +304,8 @@ + * significant bit depends on OPT_ACCURACY via mad_f_scale64(). + */ + # define MAD_F_MLX(hi, lo, x, y) \ +- asm ("mult %2,%3" \ +- : "=l" (lo), "=h" (hi) \ ++ asm ("mult %2,%3\n\tmfhi %1" \ ++ : "=l" (lo), "=r" (hi) \ + : "%r" (x), "r" (y)) + + # if defined(HAVE_MADD_ASM) -- cgit v1.3 From fdbd19ea6b784d164986856414a0fd6c25dab7b2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 2 Nov 2013 18:04:45 -0400 Subject: gnu: gd: fix deplibs check method for mips64. * gnu/packages/patches/gd-mips64-deplibs-fix.patch: New file. * gnu/packages/gd.scm (gd): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/gd.scm | 5 ++++- gnu/packages/patches/gd-mips64-deplibs-fix.patch | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gd-mips64-deplibs-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index fe8474476..0b81d64aa 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -221,6 +221,7 @@ dist_patch_DATA = \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ + gnu/packages/patches/gd-mips64-deplibs-fix.patch \ gnu/packages/patches/gdb-loongson-madd-fix.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 13bcd45f7..ce3db6709 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -20,6 +20,7 @@ #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (gnu packages) #:use-module (gnu packages libpng) #:use-module (gnu packages libjpeg) #:use-module (gnu packages fontutils) @@ -40,7 +41,9 @@ (uri "https://bitbucket.org/libgd/gd-libgd/get/GD_2_0_33.tar.gz") (sha256 (base32 - "0yrbx8mj9pykyzm0zl1q86xlkdvkajcsf5jmg688vhw9yc5wmbbw")))) + "0yrbx8mj9pykyzm0zl1q86xlkdvkajcsf5jmg688vhw9yc5wmbbw")) + (patches + (list (search-patch "gd-mips64-deplibs-fix.patch"))))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-after diff --git a/gnu/packages/patches/gd-mips64-deplibs-fix.patch b/gnu/packages/patches/gd-mips64-deplibs-fix.patch new file mode 100644 index 000000000..6231310cd --- /dev/null +++ b/gnu/packages/patches/gd-mips64-deplibs-fix.patch @@ -0,0 +1,17 @@ +Patch configure script to choose pass_all deplibs check method for +linux-gnu* systems on mips64. This is a temporary hack until libgd +bootstraps their build system with a newer libtool. + +Patch by Mark H Weaver . + +--- libgd-gd/src/configure.orig 2006-04-05 11:56:57.000000000 -0400 ++++ libgd-gd/src/configure 2013-11-02 17:56:19.123995838 -0400 +@@ -4457,7 +4457,7 @@ + # This must be Linux ELF. + linux-gnu*) + case $host_cpu in +- alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) ++ alpha* | hppa* | i*86 | mips | mipsel | mips64 | mips64el | powerpc* | sparc* | ia64* | s390* | x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM -- cgit v1.3 From c5916538fdf57c93dc8a5880c9eb4e2ca88aa760 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 2 Nov 2013 18:12:36 -0400 Subject: gnu: liboop: fix deplibs check method for mips64. * gnu/packages/patches/liboop-mips64-deplibs-fix.patch: New file. * gnu/packages/lsh.scm (liboop): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/lsh.scm | 3 ++- gnu/packages/patches/liboop-mips64-deplibs-fix.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/liboop-mips64-deplibs-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 0b81d64aa..0a8976d17 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -241,6 +241,7 @@ dist_patch_DATA = \ gnu/packages/patches/hop-bigloo-4.0b.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libffi-mips-n32-fix.patch \ + gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests.patch \ diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index 58040839e..7d9ba78a5 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -43,7 +43,8 @@ version ".tar.gz")) (sha256 (base32 - "0z6rlalhvfca64jpvksppc9bdhs7jwhiw4y35g5ibvh91xp3rn1l")))) + "0z6rlalhvfca64jpvksppc9bdhs7jwhiw4y35g5ibvh91xp3rn1l")) + (patches (list (search-patch "liboop-mips64-deplibs-fix.patch"))))) (build-system gnu-build-system) (home-page "http://www.lysator.liu.se/liboop/") (synopsis "Event loop library") diff --git a/gnu/packages/patches/liboop-mips64-deplibs-fix.patch b/gnu/packages/patches/liboop-mips64-deplibs-fix.patch new file mode 100644 index 000000000..b91754a8c --- /dev/null +++ b/gnu/packages/patches/liboop-mips64-deplibs-fix.patch @@ -0,0 +1,17 @@ +Patch configure script to choose pass_all deplibs check method for +linux-gnu* systems on mips64. This is a temporary hack until liboop +bootstraps their build system with a newer libtool. + +Patch by Mark H Weaver . + +--- liboop/configure.orig 2003-10-26 11:41:19.000000000 -0500 ++++ liboop/configure 2013-11-02 18:09:11.079995796 -0400 +@@ -3395,7 +3395,7 @@ + # This must be Linux ELF. + linux*) + case $host_cpu in +- alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) ++ alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | mips64 | mips64el | powerpc* | sparc* | s390* | sh*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM -- cgit v1.3 From f57ff219ad9e08427e06d9c95fb71cc0764564c2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 17 Oct 2013 15:47:56 -0400 Subject: gnu: add bootstrap support for mips64el-linux using the MIPS N32 ABI. * .gitignore: Add entry for bootstrap/mips64el-linux/guile-2.0.9.tar.xz. * gnu-system.am (bootstrap_mips64el_linuxdir, dist_bootstrap_mips64el_linux_DATA, nodist_bootstrap_mips64el_linux_DATA): New variables. (DISTCLEANFILES): Add $(nodist_bootstrap_mips64el_linux_DATA). (gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz): New target. * build-aux/download.scm (file-name->uri): Adapt to the newer mips64el-linux bootstrap tarballs. * gnu/packages/bootstrap.scm (%bootstrap-guile, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Adapt to the newer mips64el-linux bootstrap tarballs. * gnu/packages/bootstrap/mips64el-linux/bash: * gnu/packages/bootstrap/mips64el-linux/mkdir: * gnu/packages/bootstrap/mips64el-linux/tar: * gnu/packages/bootstrap/mips64el-linux/xz: New files. --- .gitignore | 1 + build-aux/download.scm | 7 +++- gnu-system.am | 16 ++++++++- gnu/packages/bootstrap.scm | 51 +++++++++++++++++++++++----- gnu/packages/bootstrap/mips64el-linux/bash | Bin 0 -> 1409080 bytes gnu/packages/bootstrap/mips64el-linux/mkdir | Bin 0 -> 698500 bytes gnu/packages/bootstrap/mips64el-linux/tar | Bin 0 -> 1283708 bytes gnu/packages/bootstrap/mips64el-linux/xz | Bin 0 -> 851736 bytes 8 files changed, 64 insertions(+), 11 deletions(-) create mode 100755 gnu/packages/bootstrap/mips64el-linux/bash create mode 100755 gnu/packages/bootstrap/mips64el-linux/mkdir create mode 100755 gnu/packages/bootstrap/mips64el-linux/tar create mode 100755 gnu/packages/bootstrap/mips64el-linux/xz (limited to 'gnu-system.am') diff --git a/.gitignore b/.gitignore index 78b16800b..b5a87f44a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ config.cache /doc/version.texi /gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz /gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz +/gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz /guix/config.scm /nix/nix-daemon/nix-daemon.cc /nix/config.h diff --git a/build-aux/download.scm b/build-aux/download.scm index 91b41bcec..68ad7773f 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -45,7 +45,12 @@ (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - "/20130105/" basename))))) + (match system + ("mips64el-linux" + "/20131017/") + (_ + "/20130105/")) + basename))))) (match (command-line) ((_ file expected-hash) diff --git a/gnu-system.am b/gnu-system.am index 0a8976d17..360100932 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013 Ludovic Courtès # Copyright © 2013 Andreas Enge +# Copyright © 2013 Mark H Weaver # # This file is part of GNU Guix. # @@ -270,6 +271,7 @@ dist_patch_DATA = \ bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux +bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux dist_bootstrap_x86_64_linux_DATA = \ gnu/packages/bootstrap/x86_64-linux/bash \ @@ -283,12 +285,20 @@ dist_bootstrap_i686_linux_DATA = \ gnu/packages/bootstrap/i686-linux/tar \ gnu/packages/bootstrap/i686-linux/xz +dist_bootstrap_mips64el_linux_DATA = \ + gnu/packages/bootstrap/mips64el-linux/bash \ + gnu/packages/bootstrap/mips64el-linux/mkdir \ + gnu/packages/bootstrap/mips64el-linux/tar \ + gnu/packages/bootstrap/mips64el-linux/xz + # Big bootstrap binaries are not included in the tarball. Instead, they # are downloaded. nodist_bootstrap_x86_64_linux_DATA = \ gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz nodist_bootstrap_i686_linux_DATA = \ gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz +nodist_bootstrap_mips64el_linux_DATA = \ + gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz # Those files must remain executable, so they remain executable once # imported into the store. @@ -297,7 +307,8 @@ install-data-hook: DISTCLEANFILES = \ $(nodist_bootstrap_x86_64_linux_DATA) \ - $(nodist_bootstrap_i686_linux_DATA) + $(nodist_bootstrap_i686_linux_DATA) \ + $(nodist_bootstrap_mips64el_linux_DATA) # Method to download a file from an external source. DOWNLOAD_FILE = \ @@ -311,3 +322,6 @@ gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz: gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz: $(MKDIR_P) `dirname "$@"` $(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c" +gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz: + $(MKDIR_P) `dirname "$@"` + $(DOWNLOAD_FILE) "$@" "1735d8b3f94749a4a349b6135f3aaa089f65dc62951c89c6c43ba0f2fc34211d" diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 2a8af36ad..d369edb8b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -180,7 +180,12 @@ check whether everything is alright." (xz (->store "xz")) (mkdir (->store "mkdir")) (bash (->store "bash")) - (guile (->store "guile-2.0.7.tar.xz")) + (guile (->store + (match (%current-system) + ("mips64el-linux" + "guile-2.0.9.tar.xz") + (_ + "guile-2.0.7.tar.xz")))) (builder (add-text-to-store store "build-bootstrap-guile.sh" @@ -219,7 +224,11 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - "/20130105/static-binaries.tar.xz") + (match system + ("mips64el-linux" + "/20131017/static-binaries.tar.xz") + (_ + "/20130105/static-binaries.tar.xz"))) %bootstrap-base-urls)) (sha256 (match system @@ -228,7 +237,10 @@ $out/bin/guile --version~%" "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) ("i686-linux" (base32 - "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")))))) + "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")) + ("mips64el-linux" + (base32 + "17k5f1322b7n1difhlyw4cghxvq8fxj7wlhzghh4y362fshvvw1c")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -238,7 +250,11 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - "/20130105/binutils-2.22.tar.xz") + (match system + ("mips64el-linux" + "/20131017/binutils-2.23.2.tar.xz") + (_ + "/20130105/binutils-2.22.tar.xz"))) %bootstrap-base-urls)) (sha256 (match system @@ -247,7 +263,10 @@ $out/bin/guile --version~%" "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) ("i686-linux" (base32 - "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")))))) + "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")) + ("mips64el-linux" + (base32 + "1dpnmscgg1fxg9xmlbvcm1d8h8brjgqwaal748w3v3qf33is4sl6")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -289,7 +308,11 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - "/20130105/glibc-2.17.tar.xz") + (match (%current-system) + ("mips64el-linux" + "/20131017/glibc-2.18.tar.xz") + (_ + "/20130105/glibc-2.17.tar.xz"))) %bootstrap-base-urls)) (sha256 (match (%current-system) @@ -298,7 +321,10 @@ $out/bin/guile --version~%" "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) ("i686-linux" (base32 - "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88"))))))))) + "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")) + ("mips64el-linux" + (base32 + "1w9x8r2him7qbqlm7ah1aq04kk2ydma44jzgdzsdj3kjx36sqyq1"))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f) @@ -357,7 +383,11 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - "/20130105/gcc-4.7.2.tar.xz") + (match (%current-system) + ("mips64el-linux" + "/20131017/gcc-4.7.3.tar.xz") + (_ + "/20130105/gcc-4.7.2.tar.xz"))) %bootstrap-base-urls)) (sha256 (match (%current-system) @@ -366,7 +396,10 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) ("i686-linux" (base32 - "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2"))))))))) + "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")) + ("mips64el-linux" + (base32 + "0g9z8cdlnlzbg67607rxxfk5vi4xjsdc7c2agvdnyzlp0shib6rb"))))))))) (native-search-paths (list (search-path-specification (variable "CPATH") diff --git a/gnu/packages/bootstrap/mips64el-linux/bash b/gnu/packages/bootstrap/mips64el-linux/bash new file mode 100755 index 000000000..403671d2f Binary files /dev/null and b/gnu/packages/bootstrap/mips64el-linux/bash differ diff --git a/gnu/packages/bootstrap/mips64el-linux/mkdir b/gnu/packages/bootstrap/mips64el-linux/mkdir new file mode 100755 index 000000000..c8d3285b3 Binary files /dev/null and b/gnu/packages/bootstrap/mips64el-linux/mkdir differ diff --git a/gnu/packages/bootstrap/mips64el-linux/tar b/gnu/packages/bootstrap/mips64el-linux/tar new file mode 100755 index 000000000..0cdf7cce2 Binary files /dev/null and b/gnu/packages/bootstrap/mips64el-linux/tar differ diff --git a/gnu/packages/bootstrap/mips64el-linux/xz b/gnu/packages/bootstrap/mips64el-linux/xz new file mode 100755 index 000000000..b0622ba94 Binary files /dev/null and b/gnu/packages/bootstrap/mips64el-linux/xz differ -- cgit v1.3 From 7a78cc7af24a1303dd0117cb977e15ca89a5dad8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 4 Nov 2013 13:33:49 -0500 Subject: gnu: mit-krb5: don't assume arguments are evaluated right-to-left. * gnu/packages/patches/mit-krb5-init-fix.patch: New file. * gnu/packages/mit-krb5.scm (mit-krb5): Apply patch at the end of the custom unpack phase. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/mit-krb5.scm | 9 ++++++++- gnu/packages/patches/mit-krb5-init-fix.patch | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mit-krb5-init-fix.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 360100932..fa04f822c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -251,6 +251,7 @@ dist_patch_DATA = \ gnu/packages/patches/m4-readlink-EINVAL.patch \ gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/mcron-install.patch \ + gnu/packages/patches/mit-krb5-init-fix.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/procps-make-3.82.patch \ diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 8222212d9..361cd36f2 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -37,6 +37,8 @@ (sha256 (base32 "1daiaxgkxcryqs37w28v4x1vajqmay4l144d1zd9c2d7jjxr9gcs")))) (build-system gnu-build-system) + (native-inputs + `(("patch/init-fix" ,(search-patch "mit-krb5-init-fix.patch")))) (inputs `(("bison" ,bison) ("perl" ,perl))) (arguments @@ -51,7 +53,12 @@ (and (zero? (system* "tar" "xvf" source)) (zero? (system* "tar" "xvf" (string-append inner ".tar.gz"))) (chdir inner) - (chdir "src")))) + (chdir "src") + ;; XXX The current patch system does not support unusual + ;; source unpack methods, so we have to apply this patch in a + ;; non-standard way. + (zero? (system* "patch" "-p1" "--batch" "-i" + (assoc-ref %build-inputs "patch/init-fix")))))) (alist-replace 'check (lambda* (#:key inputs #:allow-other-keys #:rest args) diff --git a/gnu/packages/patches/mit-krb5-init-fix.patch b/gnu/packages/patches/mit-krb5-init-fix.patch new file mode 100644 index 000000000..13e49c278 --- /dev/null +++ b/gnu/packages/patches/mit-krb5-init-fix.patch @@ -0,0 +1,18 @@ +Fix the early context initialization code to avoid assuming that +arguments will be evaluated from right to left. + +Patch by Mark H Weaver . + +--- src/lib/krb5/krb/t_cc_config.c.orig 2012-12-17 21:47:05.000000000 -0500 ++++ src/lib/krb5/krb/t_cc_config.c 2013-10-29 18:19:16.547994590 -0400 +@@ -117,8 +117,8 @@ + int c; + unsigned int i; + +- bail_on_err(context, "Error initializing Kerberos library", +- krb5_init_context(&context)); ++ ret = krb5_init_context(&context); ++ bail_on_err(context, "Error initializing Kerberos library", ret); + bail_on_err(context, "Error getting location of default ccache", + krb5_cc_default(context, &ccache)); + server = NULL; -- cgit v1.3 From 062134985802d85066418f6ee2f327122166a567 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Nov 2013 00:10:10 +0100 Subject: gnu: Switch to GCC 4.8 as the default compiler. * build-aux/download.scm (file-name->uri): Update URL to /20131110. * gnu-system.am (nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA): Change base name to 'guile-2.0.9.tar.xz'. (gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz): New targets. (gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Remove. (gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz): Update hash. * gnu/packages/base.scm (gcc-boot0): Base upon GCC-4.8. Enable C++, and add a few --disable flags. Remove MPFR workaround. (cross-gcc-wrapper): Base upon GCC-4.8. Wrap both 'gcc' and 'g++'. (libstdc++): New variable. (gcc-final): Add it as an input; pass corresponding -I and -L flags. * gnu/packages/bootstrap.scm (%bootstrap-guile): Always use "guile-2.0.9.tar.xz. (%bootstrap-coreutils&co): Update hashes. (%bootstrap-binutils): Update URL and hashes. (%bootstrap-glibc): Likewise. (%bootstrap-gcc): Likewise. * gnu/packages/gcc.scm (gcc-4.7): Add LDFLAGS. Add --disable-libstdcxx-pch. Modify the GNU_USER*_SPEC macros from gnu-user*.h instead of the raw _SPEC macros. --- build-aux/download.scm | 7 +-- gnu-system.am | 14 +++--- gnu/packages/base.scm | 113 ++++++++++++++++++++++++++++++--------------- gnu/packages/bootstrap.scm | 55 +++++++--------------- gnu/packages/gcc.scm | 25 +++++++--- 5 files changed, 119 insertions(+), 95 deletions(-) (limited to 'gnu-system.am') diff --git a/build-aux/download.scm b/build-aux/download.scm index 68ad7773f..50123f59d 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -45,12 +45,7 @@ (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri (string-append %url-base "/" system - (match system - ("mips64el-linux" - "/20131017/") - (_ - "/20130105/")) - basename))))) + "/20131110/" basename))))) (match (command-line) ((_ file expected-hash) diff --git a/gnu-system.am b/gnu-system.am index 9d7d29f7f..ffb18e857 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -296,9 +296,9 @@ dist_bootstrap_mips64el_linux_DATA = \ # Big bootstrap binaries are not included in the tarball. Instead, they # are downloaded. nodist_bootstrap_x86_64_linux_DATA = \ - gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz + gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz nodist_bootstrap_i686_linux_DATA = \ - gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz + gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz nodist_bootstrap_mips64el_linux_DATA = \ gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz @@ -318,12 +318,12 @@ DOWNLOAD_FILE = \ $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \ "$(top_srcdir)/build-aux/download.scm" -gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz: +gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c" -gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz: + $(DOWNLOAD_FILE) "$@" "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0" +gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c" + $(DOWNLOAD_FILE) "$@" "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846" gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz: $(MKDIR_P) `dirname "$@"` - $(DOWNLOAD_FILE) "$@" "1735d8b3f94749a4a349b6135f3aaa089f65dc62951c89c6c43ba0f2fc34211d" + $(DOWNLOAD_FILE) "$@" "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b" diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 41e1a8d04..0fa7b3f13 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -644,7 +644,7 @@ identifier SYSTEM." (define gcc-boot0 (package-with-bootstrap-guile - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name "gcc-cross-boot0") (arguments `(#:guile ,%bootstrap-guile @@ -654,7 +654,7 @@ identifier SYSTEM." (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - ,@(substitute-keyword-arguments (package-arguments gcc-4.7) + ,@(substitute-keyword-arguments (package-arguments gcc-4.8) ((#:configure-flags flags) `(append (list ,(string-append "--target=" (boot-triplet)) @@ -663,8 +663,18 @@ identifier SYSTEM." ;; Disable features not needed at this stage. "--disable-shared" - "--enable-languages=c" + "--enable-languages=c,c++" + + ;; libstdc++ cannot be built at this stage + ;; ("Link tests are not allowed after + ;; GCC_NO_EXECUTABLES."). + "--disable-libstdc++-v3" + + "--disable-threads" "--disable-libmudflap" + "--disable-libatomic" + "--disable-libsanitizer" + "--disable-libitm" "--disable-libgomp" "--disable-libssp" "--disable-libquadmath" @@ -691,24 +701,7 @@ identifier SYSTEM." ,@(map (lambda (lib) `(symlink ,(package-full-name lib) ,(package-name lib))) - (list gmp mpfr mpc)) - - ;; MPFR headers/lib are found under $(MPFR)/src, but - ;; `configure' wrongfully tells MPC too look under - ;; $(MPFR), so fix that. - (substitute* "configure" - (("extra_mpc_mpfr_configure_flags(.+)--with-mpfr-include=([^/]+)/mpfr(.*)--with-mpfr-lib=([^ ]+)/mpfr" - _ equals include middle lib) - (string-append "extra_mpc_mpfr_configure_flags" equals - "--with-mpfr-include=" include - "/mpfr/src" middle - "--with-mpfr-lib=" lib - "/mpfr/src")) - (("gmpinc='-I([^ ]+)/mpfr -I([^ ]+)/mpfr" _ a b) - (string-append "gmpinc='-I" a "/mpfr/src " - "-I" b "/mpfr/src")) - (("gmplibs='-L([^ ]+)/mpfr" _ a) - (string-append "gmplibs='-L" a "/mpfr/src"))))) + (list gmp mpfr mpc)))) (alist-cons-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) @@ -718,7 +711,7 @@ identifier SYSTEM." (with-directory-excursion (string-append out "/lib/gcc/" ,(boot-triplet) - "/" ,(package-version gcc-4.7)) + "/" ,(package-version gcc-4.8)) (symlink "libgcc.a" "libgcc_eh.a")))) ,phases)))))) @@ -734,7 +727,7 @@ identifier SYSTEM." ;; No need for Texinfo at this stage. (native-inputs (alist-delete "texinfo" - (package-native-inputs gcc-4.7)))))) + (package-native-inputs gcc-4.8)))))) (define (linux-libre-headers-boot0) "Return Linux-Libre header files for the bootstrap environment." @@ -800,7 +793,7 @@ identifier SYSTEM." (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name (string-append (package-name gcc) "-wrapped")) (source #f) (build-system trivial-build-system) @@ -817,27 +810,29 @@ that makes it available under the native tool names." (out (assoc-ref %outputs "out")) (bindir (string-append out "/bin")) (triplet ,(boot-triplet))) - (mkdir-p bindir) - (with-directory-excursion bindir - (for-each (lambda (tool) - (symlink (string-append binutils "/bin/" - triplet "-" tool) - tool)) - '("ar" "ranlib")) - + (define (wrap-program program) ;; GCC-BOOT0 is a libc-less cross-compiler, so it ;; needs to be told where to find the crt files and ;; the dynamic linker. - (call-with-output-file "gcc" + (call-with-output-file program (lambda (p) (format p "#!~a/bin/bash -exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" +exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" bash - gcc triplet + gcc triplet program libc libc ,(glibc-dynamic-linker)))) - (chmod "gcc" #o555)))))) + (chmod program #o555)) + + (mkdir-p bindir) + (with-directory-excursion bindir + (for-each (lambda (tool) + (symlink (string-append binutils "/bin/" + triplet "-" tool) + tool)) + '("ar" "ranlib")) + (for-each wrap-program '("gcc" "g++"))))))) (native-inputs `(("binutils" ,binutils) ("gcc" ,gcc) @@ -893,6 +888,36 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments binutils))) (inputs %boot2-inputs)))) +(define libstdc++ + ;; Intermediate libstdc++ that will allow us to build the final GCC + ;; (remember that GCC-BOOT0 cannot build libstdc++.) + (package-with-bootstrap-guile + (package (inherit gcc-4.8) + (name "libstdc++") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + + #:out-of-source? #t + #:phases (alist-cons-before + 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3")) + %standard-phases) + #:configure-flags `("--disable-shared" + "--disable-libstdcxx-threads" + "--disable-libstdcxx-pch" + ,(string-append "--with-gxx-include-dir=" + (assoc-ref %outputs "out") + "/include" + ;; "/include/c++/" + ;; ,(package-version gcc-4.8) + )))) + (inputs %boot2-inputs) + (native-inputs '()) + (propagated-inputs '()) + (synopsis "GNU C++ standard library (intermediate)")))) + (define-public gcc-final ;; The final GCC. (package (inherit gcc-boot0) @@ -906,12 +931,25 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) ,@(substitute-keyword-arguments (package-arguments gcc-boot0) ((#:configure-flags boot-flags) - (let loop ((args (package-arguments gcc-4.7))) + (let loop ((args (package-arguments gcc-4.8))) (match args ((#:configure-flags normal-flags _ ...) normal-flags) ((_ rest ...) (loop rest))))) + ((#:make-flags flags) + ;; Since $LIBRARY_PATH and $CPATH are not honored, add the + ;; relevant flags. + `(cons (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "libstdc++") + "/include") + (map (lambda (flag) + (if (string-prefix? "LDFLAGS=" flag) + (string-append flag " -L" + (assoc-ref %build-inputs "libstdc++") + "/lib") + flag)) + ,flags))) ((#:phases phases) `(alist-delete 'symlink-libgcc_eh ,phases))))) @@ -919,6 +957,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) ("binutils" ,binutils-final) + ("libstdc++" ,libstdc++) ,@%boot2-inputs)))) (define ld-wrapper-boot3 diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index d369edb8b..981cde9f2 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -180,12 +180,7 @@ check whether everything is alright." (xz (->store "xz")) (mkdir (->store "mkdir")) (bash (->store "bash")) - (guile (->store - (match (%current-system) - ("mips64el-linux" - "guile-2.0.9.tar.xz") - (_ - "guile-2.0.7.tar.xz")))) + (guile (->store "guile-2.0.9.tar.xz")) (builder (add-text-to-store store "build-bootstrap-guile.sh" @@ -224,23 +219,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - (match system - ("mips64el-linux" - "/20131017/static-binaries.tar.xz") - (_ - "/20130105/static-binaries.tar.xz"))) + "/20131110/static-binaries.tar.xz") %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" (base32 - "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) + "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4")) ("i686-linux" (base32 - "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")) + "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak")) ("mips64el-linux" (base32 - "17k5f1322b7n1difhlyw4cghxvq8fxj7wlhzghh4y362fshvvw1c")))))) + "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -250,23 +241,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - (match system - ("mips64el-linux" - "/20131017/binutils-2.23.2.tar.xz") - (_ - "/20130105/binutils-2.22.tar.xz"))) + "/20131110/binutils-2.23.2.tar.xz") %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" (base32 - "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) + "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20")) ("i686-linux" (base32 - "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")) + "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9")) ("mips64el-linux" (base32 - "1dpnmscgg1fxg9xmlbvcm1d8h8brjgqwaal748w3v3qf33is4sl6")))))) + "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -308,23 +295,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("mips64el-linux" - "/20131017/glibc-2.18.tar.xz") - (_ - "/20130105/glibc-2.17.tar.xz"))) + "/20131110/glibc-2.18.tar.xz") %bootstrap-base-urls)) (sha256 (match (%current-system) ("x86_64-linux" (base32 - "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) + "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) ("i686-linux" (base32 - "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")) + "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) ("mips64el-linux" (base32 - "1w9x8r2him7qbqlm7ah1aq04kk2ydma44jzgdzsdj3kjx36sqyq1"))))))))) + "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f) @@ -383,23 +366,19 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("mips64el-linux" - "/20131017/gcc-4.7.3.tar.xz") - (_ - "/20130105/gcc-4.7.2.tar.xz"))) + "/20131110/gcc-4.8.2.tar.xz") %bootstrap-base-urls)) (sha256 (match (%current-system) ("x86_64-linux" (base32 - "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) + "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) ("i686-linux" (base32 - "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")) + "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) ("mips64el-linux" (base32 - "0g9z8cdlnlzbg67607rxxfk5vi4xjsdc7c2agvdnyzlp0shib6rb"))))))))) + "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) (native-search-paths (list (search-path-specification (variable "CPATH") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bbc0a134d..db1984306 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -73,6 +73,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC "--enable-languages=c,c++" "--disable-multilib" + ;; No pre-compiled libstdc++ headers, to save space. + "--disable-libstdcxx-pch" + "--with-local-prefix=/no-gcc-local-prefix" ,(let ((libc (assoc-ref %build-inputs "libc"))) @@ -115,7 +118,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC #:strip-binaries? ,stripped? #:configure-flags ,(configure-flags) #:make-flags - (let ((libc (assoc-ref %build-inputs "libc"))) + (let* ((libc (assoc-ref %build-inputs "libc")) + (libc-native (or (assoc-ref %build-inputs "libc-native") + libc))) `(,@(if libc (list (string-append "LDFLAGS_FOR_TARGET=" "-B" libc "/lib " @@ -123,6 +128,12 @@ where the OS part is overloaded to denote a specific ABI---into GCC "-Wl," libc ,(glibc-dynamic-linker))) '()) + + ;; Native programs like 'genhooks' also need that right. + ,(string-append "LDFLAGS=" + "-Wl,-rpath=" libc-native "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc-native ,(glibc-dynamic-linker)) ,(string-append "BOOT_CFLAGS=-O2 " ,(if stripped? "-g0" "-g")))) @@ -148,18 +159,18 @@ where the OS part is overloaded to denote a specific ABI---into GCC ;; Tell where to find libstdc++, libc, and `?crt*.o', except ;; `crt{begin,end}.o', which come with GCC. (substitute* (find-files "gcc/config" - "^(gnu-user(64)?|linux-elf)\\.h$") - (("#define LIB_SPEC (.*)$" _ suffix) + "^gnu-user.*\\.h$") + (("#define GNU_USER_TARGET_LIB_SPEC (.*)$" _ suffix) ;; Note that with this "lib" spec, we may still add a ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED. ;; There's not much that can be done to avoid it, though. - (format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \ -%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a" + (format #f "#define GNU_USER_TARGET_LIB_SPEC \ +\"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a" libc libc out out suffix)) - (("#define STARTFILE_SPEC.*$" line) + (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line) (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\" #define STANDARD_STARTFILE_PREFIX_2 \"\" -~a~%" +~a" libc line)))) ;; Don't retain a dependency on the build-time sed. -- cgit v1.3 From 13990c7343b93190716edb967ecd0159ddc1b6d9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 16 Nov 2013 23:14:28 +0100 Subject: gnu: glibc: Really disable 'ldconfig' and /etc/ld.so.cache. * gnu/packages/base.scm (glibc): Add 'snippet' to set use_ldconfig=no. Remove "glibc-no-ld-so-cache.patch"; that patch would still build 'ldconfig', and ld.so would still contain ld.so.cache-related code, and would look for info in /etc/etc/ld.so.cache (sic). * gnu/packages/patches/glibc-no-ld-so-cache.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. --- gnu-system.am | 1 - gnu/packages/base.scm | 12 +++++- gnu/packages/patches/glibc-no-ld-so-cache.patch | 53 ------------------------- 3 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/glibc-no-ld-so-cache.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index ffb18e857..20d3e6766 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -232,7 +232,6 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/glibc-make-4.0.patch \ - gnu/packages/patches/glibc-no-ld-so-cache.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/gstreamer-0.10-bison3.patch \ gnu/packages/patches/gstreamer-0.10-silly-test.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0fa7b3f13..d32f617ce 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -365,9 +365,17 @@ archives.") (sha256 (base32 "18spla703zav8dq9fw7rbzkyv9qfisxb26p7amg1x3wjh7iy3d1c")) + (snippet + ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is + ;; required on LFS distros to avoid loading the distro's libc.so + ;; instead of ours. + '(substitute* "sysdeps/unix/sysv/linux/configure" + (("use_ldconfig=yes") + "use_ldconfig=no"))) + (modules '((guix build utils))) + (imported-modules modules) (patches (map search-patch - '("glibc-no-ld-so-cache.patch" - "glibc-ldd-x86_64.patch" + '("glibc-ldd-x86_64.patch" "glibc-make-4.0.patch"))))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/glibc-no-ld-so-cache.patch b/gnu/packages/patches/glibc-no-ld-so-cache.patch deleted file mode 100644 index 75fff50b4..000000000 --- a/gnu/packages/patches/glibc-no-ld-so-cache.patch +++ /dev/null @@ -1,53 +0,0 @@ -Disable attempts to use the system-wide /etc/ld.so.cache. This is -required on LFS distros to avoid loading the distro's libc.so instead -of ours. - -Patch from Nixpkgs. Idea by Eelco Dolstra, initial patch by Jack -Cummings, minor fixups by Shea Levy. - -diff -Naur glibc-2.13-orig/elf/ldconfig.c glibc-2.13/elf/ldconfig.c ---- glibc-2.13-orig/elf/ldconfig.c 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/elf/ldconfig.c 2012-04-10 23:28:45.957492340 -0400 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ - ---- glibc-2.16.0/elf/Makefile 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/elf/Makefile 2012-11-12 23:52:21.000000000 +0100 -@@ -415,12 +415,12 @@ $(objpfx)ldconfig: $(ldconfig-modules:%= - - $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) - --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(sysconfdir)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) --CFLAGS-rtld.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) -+CFLAGS-rtld.c = $(PREFIX-FLAGS) - - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) - -diff -Naur glibc-2.13-orig/sysdeps/generic/dl-cache.h glibc-2.13/sysdeps/generic/dl-cache.h ---- glibc-2.13-orig/sysdeps/generic/dl-cache.h 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/sysdeps/generic/dl-cache.h 2012-04-10 23:28:20.077488815 -0400 -@@ -29,7 +29,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir -- cgit v1.3 From f39298004162b94447a301d582e3f73892c99953 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Nov 2013 18:30:50 +0100 Subject: gnu: pspp: Add input cairo. * gnu/packages/maths.scm (pspp): Add cairo and further necessary inputs. * gnu/packages/patches/pspp-tests.patch: New file, thanks to John Darrington . * gnu-system.am (dist_patch_DATA): Register patch. --- gnu-system.am | 1 + gnu/packages/maths.scm | 13 +++++++++---- gnu/packages/patches/pspp-tests.patch | 13 +++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/pspp-tests.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 20d3e6766..3b300ffaf 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -255,6 +255,7 @@ dist_patch_DATA = \ gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/procps-make-3.82.patch \ + gnu/packages/patches/pspp-tests.patch \ gnu/packages/patches/pulseaudio-test-timeouts.patch \ gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9b2b052a5..253128504 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,9 +26,11 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'gnu:)) #:use-module (gnu packages gcc) + #:use-module (gnu packages gtk) #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -132,12 +134,16 @@ LP/MIP solver is included in the package.") version ".tar.gz")) (sha256 (base32 - "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x")))) + "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x")) + (patches (list (search-patch "pspp-tests.patch"))))) (build-system gnu-build-system) (inputs - `(("gettext" ,gnu:gettext) + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("gettext" ,gnu:gettext) ("gsl" ,gsl) ("libxml2" ,libxml2) + ("pango" ,pango) ("readline" ,readline) ("zlib" ,zlib))) (native-inputs @@ -145,8 +151,7 @@ LP/MIP solver is included in the package.") ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - `("--without-cairo" ; FIXME: tests currently fail for lack of font - "--without-gui"))) ; FIXME: package missing dependencies + `("--without-gui"))) ; FIXME: package missing dependencies (home-page "http://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") (description diff --git a/gnu/packages/patches/pspp-tests.patch b/gnu/packages/patches/pspp-tests.patch new file mode 100644 index 000000000..3e61b6880 --- /dev/null +++ b/gnu/packages/patches/pspp-tests.patch @@ -0,0 +1,13 @@ +diff --git a/tests/output/render-test.c b/tests/output/render-test.c +index 5f4c1da..e9df96c 100644 +--- a/tests/output/render-test.c ++++ b/tests/output/render-test.c +@@ -142,7 +142,7 @@ configure_drivers (int width, int length) + string_map_insert (&options, "left-margin", "0"); + string_map_insert (&options, "right-margin", "0"); + string_map_insert_nocopy (&options, xstrdup ("paper-size"), +- xasprintf ("%dx%dpt", width * 5, length * 8)); ++ xasprintf ("%dx%dpt", width * 5, length * 16)); + driver = output_driver_create (&options); + if (driver == NULL) + exit (EXIT_FAILURE); -- cgit v1.3