moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: quote wrksrc to allow whitespace

Browse source
This commit is contained in:
Piotr Wójcik 2020-09-02 19:04:41 +02:00 • committed by Piotr
parent 4c29e554b6
commit 6efc7dd98d
9 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/build-style/fetch.sh
View file

@ -3,10 +3,10 @@
do_extract() {
local f curfile
mkdir -p ${wrksrc}
mkdir -p "${wrksrc}"
for f in ${distfiles}; do
curfile="${f#*>}"
curfile="${curfile##*/}"
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${curfile} ${wrksrc}/${curfile}
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${curfile} "${wrksrc}/${curfile}"
done
}

6
common/build-style/haskell-stack.sh
View file

@ -20,11 +20,11 @@ do_build() {
msg_error "Stackage version not set in \$stackage.\n"
fi
msg_normal "Using stackage resolver ${stackage}.\n"
STACK_ROOT=$wrksrc/.stack \
STACK_ROOT="$wrksrc/.stack" \
stack init ${_stack_args} --force --resolver ${stackage}
fi
STACK_ROOT=$wrksrc/.stack stack ${_stack_args} ${makejobs} build \
STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} ${makejobs} build \
${make_build_args}
}
@ -32,6 +32,6 @@ do_install() {
local _stack_args="--system-ghc --skip-ghc-check"
vmkdir usr/bin
STACK_ROOT=$wrksrc/.stack stack ${_stack_args} install \
STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} install \
${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
}

12
common/build-style/perl-module.sh
View file

@ -29,17 +29,17 @@ do_configure() {
fi
export PERL5LIB=$perlprefix
if [ -f ${wrksrc}/Makefile.PL ]; then
sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" ${wrksrc}/Makefile.PL
if [ -f "${wrksrc}/Makefile.PL" ]; then
sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" "${wrksrc}/Makefile.PL"
fi
if [ -z "$perl_configure_dirs" ]; then
perlmkf="$wrksrc/Makefile.PL"
if [ ! -f $perlmkf ]; then
if [ ! -f "$perlmkf" ]; then
msg_error "*** ERROR couldn't find $perlmkf, aborting ***\n"
fi
cd $wrksrc
cd "$wrksrc"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
@ -50,8 +50,8 @@ do_configure() {
for i in ${perl_configure_dirs}; do
perlmkf="$wrksrc/$i/Makefile.PL"
if [ -f $perlmkf ]; then
cd $wrksrc/$i
if [ -f "$perlmkf" ]; then
cd "$wrksrc/$i"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \