summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge commit '2858c41' into HEADFrederik Rietdijk2017-08-30
|\
| * Merge pull request #28556 from obsidiansystems/cc-wrapper-nix-cleanupJohn Ericson2017-08-26
| |\ | | | | | | cc-wrapper: Cleanup of Nix
| | * cc-wrapper: Leverage the setup script instead of `buildCommand`John Ericson2017-08-25
| | |
| | * cc-wrapper: Use `set -u` for better maintainabilityJohn Ericson2017-08-25
| | |
| | * expand-response-params: Build more normallyJohn Ericson2017-08-25
| | |
| | * expand-response-params: Pull out of cc-wrapperJohn Ericson2017-08-25
| | | | | | | | | | | | No hashes were changed
| * | Merge remote-tracking branch 'upstream/python-wip' into HEADFrederik Rietdijk2017-08-25
| |\ \ | | |/ | |/|
| * | Merge pull request #28521 from obsidiansystems/cc-wrapper-dead-codeDaniel Peebles2017-08-24
| |\ \ | | | | | | | | cc-wrapper: Remove dead code
| | * | cc-wrapper: Remove dead codeJohn Ericson2017-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ccPath is only defined below, so this condition would never be true. Worse, that's not quite true: what if somebody happend to have `/clang` and no sandboxing. Boy, wouldn't that be annoying to debug!
| * | | treewide: Consistently call ARM 'arm'Tuomas Tynkkynen2017-08-24
| |/ / | | | | | | | | | No need for silly differences.
| * | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2017-08-21
| |\ \ | | | | | | | | | | | | That way the tarball job succeeds
| * | | set +u workaround for empty arraysBojan Nikolic2017-08-21
| | | | | | | | | | | | | | | | | | | | | | | | libDirs can be empty, which in combination with "set -u" of 9f1e009975dc2d58541de435c74a26afe011542a will cause a variable unbound error on old bash versions
* | | | vm: Add trusty-updates to the packages listAntoine Eiche2017-08-30
| |_|/ |/| |
* | | mirrors: update apache and cpan mirrorsvolth2017-08-24
| |/ |/| | | removed dead mirrors, added new
* | cc-wrapper: Remove unused paramsJohn Ericson2017-08-21
|/ | | | Ensured hashes unchanged and eval succeeds in tarball job
* cc-wrapper: don't export CPPDaiderd Jordan2017-08-16
| | | | | | | CPP defaults to $(CC) -E and setting it explicitly seems to cause issues in a number of packages like gcc and gdb. https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
* cc-wrapper: Improve `set -u` complianceJohn Ericson2017-08-14
|
* Merge remote-tracking branch 'origin/gcc-6' into stagingEelco Dolstra2017-08-14
|\
| * Merge branch 'master' into gcc-6Vladimír Čunát2017-08-12
| |\
| * | cc-wrapper: Add a "man" outputEelco Dolstra2017-07-25
| | | | | | | | | | | | ... and propagate cc.man from there.
| * | stdenvLinux: Remove bootstrapTools from closureEelco Dolstra2017-07-25
| | | | | | | | | | | | | | | The "expand-response-params" program had an unnecessary reference to bootstrapTools, bloating the closure from 205 to 314 MiB.
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-08-14
|\ \ \
| * \ \ Merge pull request #27881 from mimadrid/fix/http-httpsFrederik Rietdijk2017-08-13
| |\ \ \ | | | | | | | | | | Update homepage attributes: http -> https
| | * | | Update homepage attributes: http -> httpsmimadrid2017-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated https://repology.org/repository/nix_stable/problems
* | | | | makeWrapper: use consistent styleTuomas Tynkkynen2017-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | All the other plain variable references (before e1d46c0c4) are without braces.
* | | | | stdenv: Don't move info pages to the 'man' outputTuomas Tynkkynen2017-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because if you were to disable man pages via 'programs.man.enable', the "man" output wouldn't be installed and the info pages would go missing.
* | | | | stdenv: Don't move man or info pages to $docTuomas Tynkkynen2017-08-11
|/ / / / | | | | | | | | | | | | | | | | Because .doc is normally not installed to user environments, these manpages are unaccessible by default otherwise.
* | | | Merge pull request #27998 from davidak/macOSDomen Kožar2017-08-11
|\ \ \ \ | |_|_|/ |/| | | replace "Mac OS X" and "OS X" with "macOS"
| * | | replace "Mac OS X" and "OS X" with "macOS"davidak2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as it is the official name since 2016 https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop exception are parts refering to older versions of macOS like "GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
| * | | Merge commit 'ad83979e5986fa3bb0d254c2be9482c12a8743b9' from stagingRobin Gloster2017-08-06
| |\ \ \
* | | | | cc-wrapper: fix LD_DYLD_PATH on darwinDaiderd Jordan2017-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having multiple compilers in the build environment would result in an invalid LD_DYLD_PATH like /usr/lib/dyld/usr/lib/dyld. Since the path is hardcoded in XNU it can't be anything but /usr/lib/dyld anyway.
* | | | | cc-wrapper: Fix support for qtbase-setup-hookOrivej Desh2017-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | Revert https://github.com/NixOS/nixpkgs/pull/27657#issuecomment-318161946 due to https://github.com/NixOS/nixpkgs/pull/28021#issuecomment-321045542
* | | | | makeWrapper: fix regression introduced in #24944Frederik Rietdijk2017-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | In some cases wrappers could not be made. See e.g. https://github.com/NixOS/nixpkgs/pull/24944#issuecomment-321175692
* | | | | Merge pull request #24944 from ahmedtd/make-makewrapper-pickyPeter Simons2017-08-08
|\ \ \ \ \ | | | | | | | | | | | | makeWrapper: Fail loudly when misused
| * | | | | makeWrapper: Only wrap normal executable filesTaahir Ahmed2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `makeWrapper` and `wrapProgram` are being invoked on all kinds of wacky things (usually with the help of bash globs or other machine assistance). So far, I have come across `wrapProgram` being invoked on a directory, as well as on the empty string. As far as I can tell, it's only valid to invoke these utilities on a normal (non-directory, non-device) executable file. This commit enforces that precondition.
* | | | | | cc-wrapper: Fix standalone ldOrivej Desh2017-08-08
| | | | | |
* | | | | | cc-wrapper: Fix standalone gccOrivej Desh2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that all salted variables are defined even if the wrapped program is invoked outside nix-build environment.
* | | | | | cc-wrapper: Fix adding directories to rpathOrivej Desh2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug introduced in #27831: `for path in "$dir"/lib*.so` assumed that all libs match `lib*.so`, but 07674788d6932fe702117649b4cd16512d2da8a9 started adding libs that match `*.so` and `*.so.*`.
* | | | | | Revert "cc-wrapper: fix set -u errors"Robin Gloster2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67a41eafe9c92269c9f6788f5f54a4b0d282cb96. see #28021 for discussion
* | | | | | cc-wrapper: fix set -u errorsRobin Gloster2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | cc @Ericson2314
* | | | | | Merge pull request #25185 from ahmedtd/fix-makewrapper-unsupported-argsPeter Simons2017-08-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix makewrapper unsupported args
| * | | | | | makeWrapper: Die on unsupported argumentsTaahir Ahmed2017-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, makeWrapper would accept arguments it didn't recognize, potentially allowing argument misspellings or broken callers. Now, makeWrapper dies with a backtrace if it is called incorrectly. Also changes `wrapProgram` so that it doesn't pass through the first argument twice --- this was tripping up the argument checking.
| * | | | | | dieHook: Add `die` utility functionTaahir Ahmed2017-08-08
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Calling `die "Error message"` causes the current script to exit with an error, printing a backtrace
* | | | | | cc-wrapper: Don't slurp `NIX_DONT_SET_RPATH` twiceJohn Ericson2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we end with a definition like `1 1`, which doesn't trigger the right conditional.
* | | | | | cc-wrapper: Use `set -u` throughoutJohn Ericson2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now is an opportune time to do this, as the infixSalt conversion in `add-flags.sh` ensures that all the relevant `NIX_*` vars will be defined even if empty.
* | | | | | cc-wrapper: Make hygienicJohn Ericson2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | See the added comments for what exactly has been done.
* | | | | | cc-wrapper: Unconditionally use @infixSalt@ accross the boardJohn Ericson2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a sed job, in preparation of the next commit. The rules are more or less: - s"NIX_(.._WRAPPER_)?([a-zA-Z0-9@]*)"NIX_\1@infixSalt@_\2"g - except for non-cc-wrapper-specific vars like `NIX_DEBUG`
* | | | | | cc-wrapper: Stop preWrappingJohn Ericson2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ugly temp hack for cross compilation, but now we have something better on the way. Bind `infixSalt` as an environment variable as it will be used in it.
* | | | | | Merge branch 'master' into stagingVladimír Čunát2017-08-06
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Let's drop i686-linux here as well.
| * | | | | Fix emacs wrapper expression to honor bash array useMichael Alan Dorman2017-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 8d76eff, @Ericson2314 changed the representation of the value that `findInputs` generated from a whitespace-separated bunch strings to an actual array of strings. Expressions that *consume* that value, however, also needed to be changed to iterate over all the contents of the array, else they would only select the first value, which turns out to be somewhat limiting. Fixes #27873