bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: allow correctly sourcing when $LIBRARY is not set

Browse source 
We usually set this up to default to the build time configured install
location, but a couple of files crept in without this.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2021-07-04 12:56:07 -04:00 • committed by Allan McRae
parent 82aaee1a5c
commit 2d198c1af9
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/libmakepkg/buildenv.sh.in
View file

@ -22,6 +22,8 @@
[[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return
LIBMAKEPKG_BUILDENV_SH=1 LIBMAKEPKG_BUILDENV_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
declare -a buildenv_functions build_options declare -a buildenv_functions build_options
for lib in "$LIBRARY/buildenv/"*.sh; do for lib in "$LIBRARY/buildenv/"*.sh; do

2
scripts/libmakepkg/executable.sh.in
View file

@ -21,6 +21,8 @@
[[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return [[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return
LIBMAKEPKG_EXECUTABLE_SH=1 LIBMAKEPKG_EXECUTABLE_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
declare -a executable_functions declare -a executable_functions
for lib in "$LIBRARY/executable/"*.sh; do for lib in "$LIBRARY/executable/"*.sh; do

2
scripts/libmakepkg/util/pkgbuild.sh.in
View file

@ -21,6 +21,8 @@
[[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return [[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return
LIBMAKEPKG_UTIL_PKGBUILD_SH=1 LIBMAKEPKG_UTIL_PKGBUILD_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/schema.sh" source "$LIBRARY/util/schema.sh"