1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

135 commits

Author SHA1 Message Date
John Ericson 87fab3d6a5 Merge some merged cross-compilation PRs into into staging 2017-06-23 20:24:27 -04:00
John Ericson 167b80ba76 coreutils: Modernize and fix for cross
"--host=..." needs to be passed but crossAttrs overrides that.
2017-06-22 17:53:52 -04:00
Franz Pletz 6a850d2b11
coreutils: fix tests depending on setuid/setgid bits 2017-06-22 00:41:53 +02:00
Eric Litak 980ced505f coreutils: fixing ccCross.libc lookup 2017-04-14 02:00:08 -07:00
ndowens d94acf8519 coreutils: 8.26 -> 8.27 2017-03-09 14:42:26 -06:00
David Grayson 5b88f09ec4 coreutils: Fix indentation after removing self in buildPackages commit 2017-01-24 11:37:56 -05:00
John Ericson eee7cafaf7 coreutils: Use buildPackages instead of self hack for native version 2017-01-24 11:37:56 -05:00
Tuomas Tynkkynen bde8632106 coreutils: Build with libattr to support xattrs
Fixes #21649
2017-01-05 00:55:35 +02:00
Tuomas Tynkkynen 30074ddfea coreutils: Fix cross build
`make install` was failing presumably due to an upstream cross-compilation bug:

Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.

While at it, remove the old ugly cross buildPhase. It was seemingly
trying to work around the fact that the man pages are generated by
piping each command's --help output to help2man. That obviously doesn't
work while cross-compiling.

Instead, set PERL=missing in the environment to make the build system
think there's no perl available to run help2man. (This approach was
stolen from buildroot.)
2016-12-24 22:33:05 +02:00
Vladimír Čunát 3a0f1975b0
Revert "Revert "Merge pull request #21234 from l2dy/coreutils-up""
This reverts commit ffb90e8c4f.
This moves the coreutils update from master.
2016-12-17 20:30:09 +01:00
Tuomas Tynkkynen 659f75bfcd coreutils-prefixed: Fix build since the single-binary changes
With the symlinked build it's only renaming 'coreutils' to
'gcoreutils' and leaving all the actual command symlinks alone.

Instead of custom renaming scripts, let's use --program-prefix
from the autotools kitchen sink. This has the nice(?) bonus that
the manpages also get prefixed with 'g' now.

The build system refuses to enable both single-binary build and
--program-prefix - but the symlink-based single-binary build couldn't
possibly work either (as it will be looking at "$0" for which command
to execute).
2016-12-04 18:21:02 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Daiderd Jordan b7c134358d coreutils: use symlinks instead of shell wrapper 2016-07-09 16:47:54 +02:00
Vladimír Čunát f4792cdc0c make-bootstrap-tools*: fixup after #16406
Our coreutils now uses single-binary-build mode where, by default,
simple shebang scripts are used for all the binaries. That doesn't work
e.g. with the Linux unpacker which only handles standard binaries and
symlinks. Let's use the symlinked mode instead for boostrapping.
This does NOT change any stdenv hashes.

I only tested the case most important to me:
$ nix-build pkgs/top-level/release.nix -A stdenvBootstrapTools.x86_64-linux.test
2016-06-28 09:54:22 +02:00
Wout Mertens c26bbf0b87 coreutils: single binary build 2016-06-21 22:14:10 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát bb73e25cdc coreutils: disable checks when using non-standard storeDir
That should help with https://github.com/NixOS/nix/issues/512
2016-05-13 11:41:17 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Franz Pletz a2e449e43e coreutils: Skip some tests (filenames too long) 2016-03-05 18:55:26 +01:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Tuomas Tynkkynen 8bfc5d7e72 coreutils: Remove ARM patch (coreutils-tail-inotify-race.patch)
The patch no longer applies as it's applied in the 8.25 release.

While at it don't use FORCE_UNSAFE_CONFIGURE on ARM as I don't see why
it's needed and it works for me without it.

Build-tested GNU hello on ARMv7 and verified that this affect its hash
on i686.
2016-02-20 19:36:21 +02:00
Eelco Dolstra 854c27c69c coreutils: 8.24 -> 8.25 2016-02-18 21:59:11 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Vladimír Čunát 263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Burke Libbey 211c9ab28b Add coreutils-prefixed to install coreutils as gls, ggrep, etc.
Close #11421. Amended by vcunat not to cause a stdenv rebuild.
2015-12-03 20:08:37 +01:00
Danny Wilson e3a036225d Fix: remove trailing ; 2015-11-22 13:41:22 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Danny Wilson 590eec7945 Simplify FORCE_UNSAFE_CONFIGURE by making it an optional string.
postInstall references ${self} and requires self to be a derivation.
2015-11-17 18:29:54 +01:00
Danny Wilson caaded3713 Disable inotify support on SunOS: it’s Linux-specific.
This amazingly fixes the coreutils build on SmartOS.
2015-11-16 17:20:15 +01:00
Danny Wilson 340375f421 Make sure optionalAttrs are set before actually building a derivation. 2015-11-16 17:20:15 +01:00
Lluís Batlle i Rossell 9819303647 Fixing the logic in coreutils to avoid stdenv rebuild.
It was using 'null' instead of '[]' in case of no patches. So I change
it to provide 'null'.

(cherry picked from commit 56ff659e5d)
2015-11-04 12:43:14 +01:00
Lluís Batlle i Rossell 00aeb53bc0 coreutils 8.24 have a bug exhibited in a test in the Pi2. Patching.
I pick the patch from upstream, and I apply only for ARM to avoid rebuilding
stdenv.

(cherry picked from commit 1b36f489b6)
2015-11-04 12:43:13 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III d253b3d875 coreutils: Skip sparse cp test as it fails reliably with btrfs on ubuntu 14.04 2015-07-13 13:48:59 -07:00
William A. Kennington III 6aa4714dba coreutils: 8.23 -> 8.24 2015-07-06 17:37:18 -07:00
William A. Kennington III c96d269ad7 coreutils: Fix gmp in cross build 2015-06-19 11:23:43 -07:00
Rok Garbas a84e6336bd cygwin: make coreutils build on cygwin 2015-06-05 00:39:38 +02:00
Marko Durkovic 221b5a5be5 cygwin: findutils fpending and coreutils patch 2015-05-28 10:53:35 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eric Seidel 68647a4de5 coreutils: don't use bare sed on darwin
it will be BSD sed instead of GNU sed
2015-03-21 09:14:35 -07:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Vladimír Čunát e73933da9c coreutils: skip dd/sparse test (fixes #6306)
It's not done very nicely, as the main build log still prints as if the
test ran and succeeded, but I'm lazy to dig deeper into the framework.
2015-03-18 20:20:18 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Eelco Dolstra 7456ae4f5c coreutils: Update to 8.23 2014-10-06 20:40:11 +02:00
Vladimír Čunát 030af0a803 fix .xz in stdenv bootstrap
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
2014-08-30 15:48:17 +02:00
Vladimír Čunát a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00