3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

32 commits

Author SHA1 Message Date
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Ludovic Courtès b4ae0db5a5 guile: Improve `disable-gc-sensitive-tests.patch'.
svn path=/nixpkgs/trunk/; revision=18907
2009-12-11 21:48:14 +00:00
Lluís Batlle i Rossell 75b60caea0 Updating guile so it uses gawk as a buildNativeInput and not as buildInput.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18561
2009-11-23 17:01:28 +00:00
Lluís Batlle i Rossell 45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Ludovic Courtès 98af7b9cb9 GNU Guile 1.8: Clean up.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18545
2009-11-22 22:16:58 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell a263cb814e Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build
- Fixing cross-linking, through --rpath-link (ld(1) explains well about it
- Made gcc call the linker and the assembler through the gcc wrapper instead of
  directly. I thought this was the source of missing -rpath's, but the source
  of the problem ended up being the lack of --rpath-link. But I think the
  native gcc calls the wrapped ld and as, so let's do the same cross
  compiling.
- Removed the binutilsCross from the glibc expressions. Now they are built
  using the gcc-cross-wrapper, and they were built with the direct gcc and
  binutils before this change.
- I think patchelf and strip don't break the cross-compiled binaries, so I
  reallow them on cross compilation.
- I disable the checkPhase on cross compilation. This made gmp and libtool
  fail when cross compiled, iirc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
2009-11-21 02:42:52 +00:00
Lluís Batlle i Rossell a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Ludovic Courtès 1f9e87871e GNU Guile 1.9: Remove unnecessary patch.
svn path=/nixpkgs/trunk/; revision=18418
2009-11-18 13:41:17 +00:00
Ludovic Courtès e615bc4574 GNU Guile 1.9.5.
svn path=/nixpkgs/trunk/; revision=18415
2009-11-18 13:18:24 +00:00
Ludovic Courtès f7947871a3 GNU Guile 1.9 with coverage analysis builds.
svn path=/nixpkgs/trunk/; revision=17994
2009-10-28 16:16:23 +00:00
Ludovic Courtès 8e9ea2c209 GNU Guile 1.9.4 (alpha).
svn path=/nixpkgs/trunk/; revision=17843
2009-10-16 08:00:36 +00:00
Ludovic Courtès 50f75f17c5 Guile 1.9: Work around defects in guile-2.0.pc' and guile-config'.
svn path=/nixpkgs/trunk/; revision=17486
2009-09-28 23:23:37 +00:00
Ludovic Courtès cdd0317b9a Guile 1.9: Propagate `pkg-config'.
svn path=/nixpkgs/trunk/; revision=17359
2009-09-23 09:13:51 +00:00
Ludovic Courtès 717910394b GNU Guile 1.9.3.
svn path=/nixpkgs/trunk/; revision=17188
2009-09-16 12:46:17 +00:00
Ludovic Courtès 8e0c39c285 GNU Guile 1.8.7.
svn path=/nixpkgs/trunk/; revision=16181
2009-07-05 21:41:36 +00:00
Ludovic Courtès 37812e79dd GNU Guile 1.8.6.
svn path=/nixpkgs/trunk/; revision=13599
2008-12-08 22:15:47 +00:00
Michael Raskin 65b252a0df Patched Guile to load srfi .so files correctly from its own directory.
svn path=/nixpkgs/trunk/; revision=12120
2008-06-16 14:27:26 +00:00
Ludovic Courtès 7cc1d84272 GNU Guile 1.8.5.
svn path=/nixpkgs/trunk/; revision=11798
2008-05-09 12:12:26 +00:00
Ludovic Courtès 144e3b4e9d Guile: Use `share/guile/site' as the standard Guile module location.
svn path=/nixpkgs/trunk/; revision=11507
2008-04-09 08:15:30 +00:00
Ludovic Courtès 95f0e6a1a7 Differentiate between longDescription' and description'.
svn path=/nixpkgs/trunk/; revision=11230
2008-03-20 14:35:03 +00:00
Ludovic Courtès 420506d752 Guile: Add various fixes allowing the test suite to run.
svn path=/nixpkgs/trunk/; revision=11196
2008-03-19 08:42:30 +00:00
Ludovic Courtès 9433120f1f Guile: Disable `doCheck' for now.
svn path=/nixpkgs/trunk/; revision=11107
2008-03-13 21:04:07 +00:00
Ludovic Courtès c1389c4f36 Guile: Run the test suite.
Warning: This makes `nix-worker' hang at the very end of the process,
once "make install" has completed and all installed files have been
scanned for references.

svn path=/nixpkgs/trunk/; revision=11099
2008-03-13 14:18:29 +00:00
Ludovic Courtès 401543289c GNU Guile 1.8.4.
svn path=/nixpkgs/trunk/; revision=10764
2008-02-20 09:02:00 +00:00
Ludovic Courtès df17eb0dc3 Guile: fix chroot build; make sure guile-snarf' sees gawk'; add a setup hook.
svn path=/nixpkgs/trunk/; revision=10636
2008-02-12 10:41:00 +00:00
Michael Raskin 306ae4b8b4 Bumped Guile version by applying patch by Ludovic Cuort\`es. Added sdparm.
svn path=/nixpkgs/trunk/; revision=9910
2007-12-11 20:48:52 +00:00
Yury G. Kudryashov bfe435ebaf guile: propagate build inputs
svn path=/nixpkgs/trunk/; revision=9644
2007-11-11 20:23:54 +00:00
Michael Raskin 2d9f1f42b6 Now Guile works
svn path=/nixpkgs/trunk/; revision=9394
2007-10-02 20:48:39 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Martin Bravenboer f7601af74e Added guile
svn path=/nixpkgs/trunk/; revision=2310
2005-02-25 22:22:40 +00:00