public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiple-outputs.sh: fixup when it's always sourced now

Browse Source
This commit is contained in:
Vladimír Čunát 2014-08-30 15:53:24 +02:00
parent 030af0a803
commit 38ba4eb693
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -1,3 +1,5 @@
# The base package for automatic multiple-output splitting. Used in stdenv as well.
preConfigureHooks+=(_multioutConfig) preConfigureHooks+=(_multioutConfig)
preFixupHooks+=(_multioutDocs) preFixupHooks+=(_multioutDocs)
preFixupHooks+=(_multioutDevs) preFixupHooks+=(_multioutDevs)
@ -43,7 +45,7 @@ propagateIntoOutput="${!outputDev}"
# Add standard flags to put files into the desired outputs. # Add standard flags to put files into the desired outputs.
_multioutConfig() { _multioutConfig() {
if [ -z "${setOutputFlags-1}" ]; then return; fi; if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
configureFlags="\ configureFlags="\
--bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
@ -68,11 +70,9 @@ NIX_NO_SELF_RPATH=1
_moveToOutput() { _moveToOutput() {
local patt="$1" local patt="$1"
local dstOut="$2" local dstOut="$2"
echo "XXX: m2o '$1' '$2'"
local output local output
for output in $outputs; do for output in $outputs; do
echo "XXX: output='$output'" if [ "${!output}" = "$dstOut" ]; then continue; fi
if [ "${output}" = "$dstOut" ]; then continue; fi
local srcPath local srcPath
for srcPath in ${!output}/$patt; do for srcPath in ${!output}/$patt; do
if [ ! -e "$srcPath" ]; then continue; fi if [ ! -e "$srcPath" ]; then continue; fi
@ -93,6 +93,7 @@ _moveToOutput() {
# Move documentation to the desired outputs. # Move documentation to the desired outputs.
_multioutDocs() { _multioutDocs() {
if [ "$outputs" = "out" ]; then return; fi;
echo "Looking for documentation to move between outputs" echo "Looking for documentation to move between outputs"
_moveToOutput share/man "${!outputMan}" _moveToOutput share/man "${!outputMan}"
_moveToOutput share/info "${!outputInfo}" _moveToOutput share/info "${!outputInfo}"
@ -106,7 +107,7 @@ _multioutDocs() {
# Move development-only stuff to the desired outputs. # Move development-only stuff to the desired outputs.
_multioutDevs() { _multioutDevs() {
if [ -z "${moveToDev-1}" ]; then return; fi; if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
echo "Looking for development-only stuff to move between outputs" echo "Looking for development-only stuff to move between outputs"
_moveToOutput include "${!outputInclude}" _moveToOutput include "${!outputInclude}"
_moveToOutput lib/pkgconfig "${!outputDev}" _moveToOutput lib/pkgconfig "${!outputDev}"
@ -117,6 +118,8 @@ _multioutDevs() {
# Note: during the build, probably only the "native" development packages are useful. # Note: during the build, probably only the "native" development packages are useful.
# With current cross-building setup, all packages are "native" if not cross-building. # With current cross-building setup, all packages are "native" if not cross-building.
_multioutPropagateDev() { _multioutPropagateDev() {
if [ "$outputs" = "out" ]; then return; fi;
if [ "${!outputInclude}" != "$propagateIntoOutput" ]; then if [ "${!outputInclude}" != "$propagateIntoOutput" ]; then
mkdir -p "$propagateIntoOutput"/nix-support mkdir -p "$propagateIntoOutput"/nix-support
echo -n " ${!outputInclude}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs echo -n " ${!outputInclude}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs