alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #245909 from Artturin/setupshchanges2

Browse source
This commit is contained in:
Artturi 2023-09-04 20:41:16 +03:00 committed by GitHub
parent f38c0b1697 fa98c56f75
commit d5139e3017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/build-support/setup-hooks/multiple-outputs.sh
View file

@ -69,8 +69,8 @@ _multioutConfig() {
# try to detect share/doc/${shareDocName} # try to detect share/doc/${shareDocName}
# Note: sadly, $configureScript detection comes later in configurePhase, # Note: sadly, $configureScript detection comes later in configurePhase,
# and reordering would cause more trouble than worth. # and reordering would cause more trouble than worth.
if [ -z "$shareDocName" ]; then if [ -z "${shareDocName:-}" ]; then
local confScript="$configureScript" local confScript="${configureScript:-}"
if [ -z "$confScript" ] && [ -x ./configure ]; then if [ -z "$confScript" ] && [ -x ./configure ]; then
confScript=./configure confScript=./configure
fi fi

2
pkgs/build-support/setup-hooks/patch-shebangs.sh
View file

@ -75,7 +75,7 @@ patchShebangs() {
read -r oldInterpreterLine < "$f" read -r oldInterpreterLine < "$f"
read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"
if [[ -z "$pathName" ]]; then if [[ -z "${pathName:-}" ]]; then
if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then
pathName=HOST_PATH pathName=HOST_PATH
else else

3
pkgs/build-support/setup-hooks/separate-debug-info.sh
View file

@ -21,6 +21,9 @@ _separateDebugInfo() {
while IFS= read -r -d $'\0' i; do while IFS= read -r -d $'\0' i; do
if ! isELF "$i"; then continue; fi if ! isELF "$i"; then continue; fi
[ -z "${READELF:-}" ] && echo "_separateDebugInfo: '\$READELF' variable is empty, skipping." 1>&2 && break
[ -z "${OBJCOPY:-}" ] && echo "_separateDebugInfo: '\$OBJCOPY' variable is empty, skipping." 1>&2 && break
# Extract the Build ID. FIXME: there's probably a cleaner way. # Extract the Build ID. FIXME: there's probably a cleaner way.
local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
if [ "${#id}" != 40 ]; then if [ "${#id}" != 40 ]; then

2
pkgs/stdenv/generic/setup.sh
View file

@ -1216,7 +1216,7 @@ fixLibtool() {
done done
sed -i "$1" \ sed -i "$1" \
-e "s^eval \(sys_lib_search_path=\).*^\1'$search_path'^" \ -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" \
-e 's^eval sys_lib_.+search_path=.*^^' -e 's^eval sys_lib_.+search_path=.*^^'
} }