1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Commit graph

498 commits

Author SHA1 Message Date
Lluís Batlle i Rossell bff99fe8b5 Making gcc 4.6 that of stdenv.
svn path=/nixpkgs/branches/stdenv-updates/; revision=28958
2011-09-01 14:28:13 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Shea Levy 1a43ce8e08 Add a substituteAllInPlace() function to stdenv
svn path=/nixpkgs/branches/stdenv-updates/; revision=27993
2011-07-28 20:28:37 +00:00
Eelco Dolstra 58a0e8fcdc * Typo.
svn path=/nixpkgs/trunk/; revision=27569
2011-07-01 09:50:34 +00:00
Shea Levy c892af0a0d Add a comment wondering why our static cpio is configured with creation and passthrough capabilities.
I may test to see if stdenv can be built without these features (I see no reason why not)

svn path=/nixpkgs/trunk/; revision=26698
2011-04-05 15:26:01 +00:00
Shea Levy 55f5360c65 The busybox cpio does not support '-V', so using '-v'
svn path=/nixpkgs/trunk/; revision=26696
2011-04-05 15:05:06 +00:00
Eelco Dolstra 66a2615eea * Fix indentation.
svn path=/nixpkgs/branches/modular-python/; revision=26680
2011-04-04 13:47:04 +00:00
Yury G. Kudryashov f227549863 Remove tabs
svn path=/nixpkgs/branches/stdenv-updates/; revision=26310
2011-03-15 09:24:43 +00:00
Lluís Batlle i Rossell c06046e5ef Improving a bit the manpage gzip code. I decided to gzip hard links and soft
links, as nix-store --optimise can care better later.


svn path=/nixpkgs/branches/stdenv-updates/; revision=26242
2011-03-09 22:17:18 +00:00
Lluís Batlle i Rossell 65c78a3222 Adding a manpage gzipping stage in the fixupPhase. This should go unnoticed,
but for the less disk space used.


svn path=/nixpkgs/branches/stdenv-updates/; revision=26241
2011-03-09 20:10:47 +00:00
Ludovic Courtès cff72e7a83 stdenv: Emit phase-started' and phase-succeeded' events.
These markers follow the format of those of `nix-store --print-build-trace',
which allows extraction of, say, phase durations in a similar way.

svn path=/nixpkgs/branches/stdenv-updates/; revision=26115
2011-02-25 15:28:11 +00:00
Eelco Dolstra 569d38ad69 * makeStaticBinaries: handle the case where configureFlags is
an array.

svn path=/nixpkgs/trunk/; revision=25641
2011-01-20 09:40:17 +00:00
Lluís Batlle i Rossell 0196bb720e Making the addCoverageInformation stdenv adapter better in the sense that it
does not override NIX_CFLAGS_COMPILE anymore in the mkDerivation parameter
attributes. This way, apacheHttpd can be built properly with coverage
information.
An indication of this problem came from the nixos tests.subversion failure.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24938
2010-11-30 14:10:52 +00:00
Lluís Batlle i Rossell c1620ef552 Fixing a stdenv problem... 'binutils' where linked with zlib from
bootstrap-tools, because zlib was there and binutils were not having an
explicit buildInput for zlib. Due to that, we ended up with stdenv
(gcc-wrapper) depending on bootstrap-tools as runtime dependency.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24790
2010-11-21 14:29:20 +00:00
Lluís Batlle i Rossell 0eb331fdc9 Updating the reference to the i686-linux bootstrap-tools, so it takes the
newest I uploaded yesterday. These have gcc 4.5.1, that fulfills the glibc
2.12.1 requirement of having a compiler equal or greater to gcc 4.4 to build
proper x86 32-bit code (http://sourceware.org/bugzilla/show_bug.cgi?id=12123)


svn path=/nixpkgs/branches/stdenv-updates/; revision=24523
2010-10-29 12:41:50 +00:00
Lluís Batlle i Rossell 641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Lluís Batlle i Rossell 0fa35eee66 I still had an error in the stdenvLinux bootstrap; for the previous commit, I
had a little svn mess in the working directory that ended up in a not working
stdenvLinux.

This time I even chose better names for the attributes, so they match better
the comments.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23428
2010-08-25 19:15:16 +00:00
Lluís Batlle i Rossell 0bfa3b030a Finally I wrote well building binutils before glibc in stdenvLinux.
I had done an attempt recently, unsuccesful, which ended in a recent revert.
This change works.
I even updated the comments in the file.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23425
2010-08-25 13:22:48 +00:00
Lluís Batlle i Rossell e7c47f424f The uclibc used in bootstrap-tools needs some options to allow bzip2 to build
with it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23414
2010-08-24 22:29:58 +00:00
Lluís Batlle i Rossell 643eb3435e Moving back my attempt to build binutils before glibc in stdenvLinux.
What I did results in segfaults in built binaries.

svn merge -c -23370 ^/nixpkgs/branches/stdenv-updates


svn path=/nixpkgs/branches/stdenv-updates/; revision=23376
2010-08-23 19:59:06 +00:00
Lluís Batlle i Rossell d2bcf1340c Adding building 'binutils' before building the 'glibc' in stdenv-linux.
This should allow keeping the i686-linux boostrap-tools.
I updated some days ago the x86_64-linux bootstrap-tools, but that update is
not needed anymore. We can revert that boostrap-tools update if anyone wants.
Pro:
- new gcc building gcc and glibc.
Contra:
- maybe some old systems (patched red had kernels come to mind) break with that update?


svn path=/nixpkgs/branches/stdenv-updates/; revision=23370
2010-08-23 18:05:19 +00:00
Peter Simons 960323ec73 pkgs/stdenv/generic: cosmetic changes
svn path=/nixpkgs/trunk/; revision=23361
2010-08-23 14:40:37 +00:00
Peter Simons eb9c20eaf3 pkgs/stdenv/generic: added stdenv attributes isFreeBSD, isOpenBSD, and isBSD
svn path=/nixpkgs/trunk/; revision=23360
2010-08-23 14:39:46 +00:00
Lluís Batlle i Rossell dc19818cc7 Propagating the 'platform' stdenv attribute properly on stdenvLinux,
so it can be used in places like the linuxHeaders expression.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23343
2010-08-21 21:08:57 +00:00
Lluís Batlle i Rossell b9080de4fd Addindg isArm and enlarging isMips for stdenv.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23326
2010-08-21 19:02:43 +00:00
Lluís Batlle i Rossell 72707853f0 Adding in stdenv an 'isMips' attribute.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23323
2010-08-21 17:14:03 +00:00
Lluís Batlle i Rossell 221317ae7b Setting new bootstrap-tools for x86_64.
Allowing 'curl' build without some dependencies, if it is told not to build
with them.

Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
2010-08-21 12:50:49 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Eelco Dolstra 19158d7dec * CURL: build without scp support on Cygwin because libssh2 doesn't
build.

svn path=/nixpkgs/trunk/; revision=23142
2010-08-12 11:54:55 +00:00
Lluís Batlle i Rossell b724fa3d44 Adding support for the /lib32 (there was /lib and /lib64 only), for the n32 ABI in mips I'm
making the longsoon2f system for.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23044
2010-08-08 18:53:00 +00:00
Peter Simons 1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Lluís Batlle i Rossell 1c078c9861 Fixing a double set attribute in stdenv
svn path=/nixpkgs/branches/stdenv-updates/; revision=23028
2010-08-07 21:07:41 +00:00
Lluís Batlle i Rossell 46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Yury G. Kudryashov 1aa8b54c41 Typos
svn path=/nixpkgs/trunk/; revision=23011
2010-08-06 20:23:35 +00:00
Peter Simons 4defdcc50c pkgs/stdenv/generic: added isSunOS attribute, similar to isLinux, isDarwin, etc.
svn path=/nixpkgs/trunk/; revision=22995
2010-08-06 12:44:54 +00:00
Eelco Dolstra a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
2010-08-06 10:34:34 +00:00
Lluís Batlle i Rossell e0a11f532b Trying to bootstrap gcc 4.5 with ppl, so it does not depend on libstdc++ from the boostrap-tools.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22947
2010-08-04 12:36:35 +00:00
Lluís Batlle i Rossell 9724fb271b Fixing the unpack bootstrap tools script so it works not only for mips.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22855
2010-08-01 22:00:14 +00:00
Lluís Batlle i Rossell 40405d03ac Trying to add the fuloong2f for bootstrap-files. It bootstraps fine
(boostrap-files cross-built)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22849
2010-08-01 21:22:51 +00:00
Lluís Batlle i Rossell 937578d5ef Some first changes to get some evaluation working on the fuloong2f
svn path=/nixpkgs/branches/stdenv-updates/; revision=22840
2010-08-01 20:57:13 +00:00
Peter Simons ba58eb8e22 pkgs/stdenv/generic: added isSunOS attribute, similar to isLinux, isDarwin, etc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22675
2010-07-20 13:14:17 +00:00
Peter Simons 226e0c7646 pkgs/stdenv/generic/setup.sh: added support for enableParallelBuilding variable
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/branches/stdenv-updates/; revision=22399
2010-06-23 14:34:59 +00:00
Marc Weber f3e7f0fdf0 reverting my patch series adding -j -l support for make
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
2010-06-19 15:52:28 +00:00
Marc Weber f446814260 no longer pass -j to make without arg which means no limit on forks. This brought down the build farm
svn path=/nixpkgs/branches/stdenv-updates/; revision=22293
2010-06-16 12:39:19 +00:00
Marc Weber 3c14e712ca setup.sh: add -j and -l options
svn path=/nixpkgs/branches/stdenv-updates/; revision=22283
2010-06-15 19:00:51 +00:00
Marc Weber 4f1075c40b generic/setup.sh: remove duplication: - add generic showCommand function which prints a command before running it - add runMake which is using that function passing the makefile if set
make all make invokations use runMake

svn path=/nixpkgs/branches/stdenv-updates/; revision=22282
2010-06-15 19:00:48 +00:00
Lluís Batlle i Rossell d30ede1a13 Reverting r22258. I got confused; we don't need a new gcc build in stdenvLinux,
but an up to date ppl package (because the current does not build with such a
new gmp)


svn path=/nixpkgs/branches/stdenv-updates/; revision=22267
2010-06-14 21:40:11 +00:00
Lluís Batlle i Rossell 0feaada94a Adding a new gcc in the middle of the linux stdenv build, so we can have a
final stdenv gcc with ppl.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22258
2010-06-14 14:02:14 +00:00
Lluís Batlle i Rossell 6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
2010-05-19 15:26:00 +00:00