jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style/perl-module: respect build_wrksrc

Browse source 
`wrksrc` is supposed to be a top-level directory. Should the build
system need to be run inside a sub-directory, `build_wrksrc` should be
used instead. We change to `build_wrksrc` implicitly before `do_build`
and `do_install`.

Let's respect `build_wrksrc` in `perl-module`.
This commit is contained in:
Đoàn Trần Công Danh 2021-07-07 23:25:31 +07:00 committed by Đoàn Trần Công Danh
parent d9095745e9
commit 8361c4807f
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,8 @@
# build_style=perl-module # build_style=perl-module
# #
# Optionally if the module needs more directories to be configured other # Optionally if the module needs more directories to be configured other
# than $XBPS_BUILDDIR/$wrksrc, one can use (relative to $wrksrc): # than $XBPS_BUILDDIR/$wrksrc/$build_wrksrc, one can use (relative to
# $wrksrc/$build_wrksrc):
# #
# perl_configure_dirs="blob/bob foo/blah" # perl_configure_dirs="blob/bob foo/blah"
# #
@ -29,17 +30,18 @@ do_configure() {
fi fi
export PERL5LIB=$perlprefix export PERL5LIB=$perlprefix
if [ -f "${wrksrc}/Makefile.PL" ]; then if [ -f "${wrksrc}/${build_wrksrc:+$build_wrksrc/}Makefile.PL" ]; then
sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" "${wrksrc}/Makefile.PL" sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" \
"${wrksrc}/${build_wrksrc:+$build_wrksrc/}Makefile.PL"
fi fi
if [ -z "$perl_configure_dirs" ]; then if [ -z "$perl_configure_dirs" ]; then
perlmkf="$wrksrc/Makefile.PL" perlmkf="$wrksrc/${build_wrksrc:+$build_wrksrc/}Makefile.PL"
if [ ! -f "$perlmkf" ]; then if [ ! -f "$perlmkf" ]; then
msg_error "*** ERROR couldn't find $perlmkf, aborting ***\n" msg_error "*** ERROR couldn't find $perlmkf, aborting ***\n"
fi fi
cd "$wrksrc" cd "$wrksrc/${build_wrksrc:+$build_wrksrc}"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \ PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \ OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
@ -49,9 +51,9 @@ do_configure() {
fi fi
for i in ${perl_configure_dirs}; do for i in ${perl_configure_dirs}; do
perlmkf="$wrksrc/$i/Makefile.PL" perlmkf="$wrksrc/${build_wrksrc:+$build_wrksrc/}$i/Makefile.PL"
if [ -f "$perlmkf" ]; then if [ -f "$perlmkf" ]; then
cd "$wrksrc/$i" cd "$wrksrc/${build_wrksrc:+$build_wrksrc/}$i"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \ PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \ OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \