3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

116 commits

Author SHA1 Message Date
Rob Vermaas 5b408a85da build cmake only on linux and freebsd
svn path=/nixpkgs/trunk/; revision=25412
2011-01-05 10:04:49 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Peter Simons baa9150130 pkgs/development/tools/build-managers/scons: cosmetic build improvements
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
   must be used.

 - Don't generate wrappers for trivial symlink aliases in bin.

 - Prefer symlinks over hard-links.

 - The dependencies of this expression don't need to be propagated.

svn path=/nixpkgs/trunk/; revision=25021
2010-12-07 11:41:25 +00:00
Peter Simons 1e1610b37e pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25009
2010-12-06 18:01:28 +00:00
Ludovic Courtès e729128faa GNU Make 3.82: Ignore test failures on Darwin.
See <http://hydra.nixos.org/build/740597/nixlog/1/raw>.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24626
2010-11-09 13:12:26 +00:00
Ludovic Courtès 7ecc652da4 Re-add GNU Make 3.81.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24623
2010-11-09 09:14:07 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Russell O'Connor 9bcb9bcea1 Patching scons to give an absolute path to python rather than using ".../bin/env python"
When users install scons, users no longer need to also install python in their environment.


svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Yury G. Kudryashov cd73464fdf Mention UIs in cmake.name
svn path=/nixpkgs/trunk/; revision=24026
2010-10-02 05:24:39 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Yury G. Kudryashov 139de1ea2f Don't try to build Qt guis if qt is unsupported on the platform
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
Yury G. Kudryashov 48c13f4096 Update cmake
Use system libraries, make curses optional, add optional qt4 gui etc.

svn path=/nixpkgs/trunk/; revision=23810
2010-09-15 18:37:21 +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
Eelco Dolstra a9da4153c4 * Fix an infinite recursion in scons.
svn path=/nixpkgs/trunk/; revision=23464
2010-08-26 13:30:25 +00:00
Peter Simons 25308dd098 pkgs/development/tools/build-managers/scons: updated to version 2.0.1
svn path=/nixpkgs/trunk/; revision=23457
2010-08-26 12:24:16 +00:00
Lluís Batlle i Rossell 75a9a710fd Fixing the gnumake log.patch so it applies to the new gnumake
svn path=/nixpkgs/branches/stdenv-updates/; revision=23308
2010-08-21 15:54:48 +00:00
Ludovic Courtès 58b1dfe0fe GNU Make 3.82.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23281
2010-08-20 15:26:41 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Ludovic Courtès c1cd5e04af Ant: Fix typo.
svn path=/nixpkgs/trunk/; revision=21991
2010-05-26 15:10:24 +00:00
Ludovic Courtès c228b1a957 Ant/GCJ: Clean up.
svn path=/nixpkgs/trunk/; revision=21990
2010-05-26 14:53:13 +00:00
Peter Simons fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression.
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Marc Weber 8d9af6d596 patch provided by David Brown adding simple-build-tool which builds Scala packages
svn path=/nixpkgs/trunk/; revision=21671
2010-05-08 21:51:47 +00:00
Peter Simons 69857a11c7 pkgs/development/tools/build-managers/scons: bumped to version 1.3.0
svn path=/nixpkgs/trunk/; revision=21025
2010-04-12 11:21:22 +00:00
Lluís Batlle i Rossell bc54fc96da Updating cmake. Big kde rebuild to come.
svn path=/nixpkgs/trunk/; revision=20996
2010-04-09 16:04:11 +00:00
Lluís Batlle i Rossell 4a6cfd435e Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module.
That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

svn path=/nixpkgs/trunk/; revision=20921
2010-04-01 18:19:44 +00:00
Marc Weber 1d5910bb94 add Gradle 0.8
patch provided by Francois Perrad

svn path=/nixpkgs/trunk/; revision=20863
2010-03-29 23:36:35 +00:00
Rob Vermaas e260b68122 added NIX_ANT_ARGS to ant wrapper
svn path=/nixpkgs/trunk/; revision=20334
2010-03-02 15:54:54 +00:00
Lluís Batlle i Rossell e0ff817c40 Big kde-related update.
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965
2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès 54322bbd02 BuildBot: Fix erroneous absolute paths.
svn path=/nixpkgs/trunk/; revision=19415
2010-01-13 21:34:50 +00:00
Rob Vermaas 5a787b0ab7 ant version 1.8.0RC1
svn path=/nixpkgs/trunk/; revision=19400
2010-01-13 15:20:24 +00:00
Ludovic Courtès 8670c51227 Merge the two BuildBot expressions.
svn path=/nixpkgs/trunk/; revision=19358
2010-01-11 17:00:46 +00:00
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
Lluís Batlle i Rossell 2dd9764a9e Major update to cmake, from 2.6.4 to 2.8.0.
I tried some kde4 builds, and the worked.

svn path=/nixpkgs/trunk/; revision=18890
2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
2009-12-10 22:19:52 +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 57a544d59c Adding 'remake': a patched and modernized version of GNU make utility that adds
improved error reporting, the ability to trace execution in a comprehensible
way, and a debugger.

svn path=/nixpkgs/trunk/; revision=17744
2009-10-11 15:03:13 +00:00
Ludovic Courtès a5945916f0 More Apache mirrors; use them for Ant.
svn path=/nixpkgs/trunk/; revision=17563
2009-10-01 09:07:09 +00:00
Ludovic Courtès c1f7e5ff90 ant-gcj: Add missing file.
svn path=/nixpkgs/trunk/; revision=17402
2009-09-24 14:50:42 +00:00
Ludovic Courtès 18e946cb9d Add Apache Ant, built from source with GCJ.
svn path=/nixpkgs/trunk/; revision=17401
2009-09-24 14:49:15 +00:00
Peter Simons 2ec77fdc7e scons: don't overwrite a pre-existing PYTHONPATH in the wrapper
svn path=/nixpkgs/trunk/; revision=16342
2009-07-13 20:08:44 +00:00
Peter Simons afa04f4576 Updated scons to version 1.2.0.
svn path=/nixpkgs/trunk/; revision=16111
2009-06-30 18:51:01 +00:00
Rob Vermaas e89d4a39c6 * added checkstyle, pmd, jdepends.
* changed version of ant to 1.7

svn path=/nixpkgs/trunk/; revision=15995
2009-06-18 12:52:10 +00:00
Lluís Batlle i Rossell 94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell 07caf9a9bd Updated cmake
svn path=/nixpkgs/trunk/; revision=15807
2009-05-31 08:34:57 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra 6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Peter Simons 047f6d20d5 Updated CMake to version 2.6.3.
svn path=/nixpkgs/trunk/; revision=15114
2009-04-17 13:48:22 +00:00
Peter Simons 2796d3a185 Updated fixCmakeFiles to handle file paths that contain whitespace.
svn path=/nixpkgs/trunk/; revision=15113
2009-04-17 13:48:11 +00:00