Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build-style/perl-module: respect build_wrksrc #31844

Merged
merged 2 commits into from
Jul 8, 2021
Merged

build-style/perl-module: respect build_wrksrc #31844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a66cc98
build-style/perl-module: respect build_wrksrc
sgn Jul 7, 2021
43b96f7
perl-Barcode-ZBar: correct license
sgn Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions common/build-style/perl-module.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
# build_style=perl-module
#
# 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"
#
Expand All @@ -29,17 +30,18 @@ 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}/${build_wrksrc:+$build_wrksrc/}Makefile.PL" ]; then
sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" \
"${wrksrc}/${build_wrksrc:+$build_wrksrc/}Makefile.PL"
fi

if [ -z "$perl_configure_dirs" ]; then
perlmkf="$wrksrc/Makefile.PL"
perlmkf="$wrksrc/${build_wrksrc:+$build_wrksrc/}Makefile.PL"
if [ ! -f "$perlmkf" ]; then
msg_error "*** ERROR couldn't find $perlmkf, aborting ***\n"
fi

cd "$wrksrc"
cd "$wrksrc/${build_wrksrc:+$build_wrksrc}"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
Expand All @@ -49,9 +51,9 @@ do_configure() {
fi

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
cd "$wrksrc/$i"
cd "$wrksrc/${build_wrksrc:+$build_wrksrc/}$i"
PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
OPTIMIZE="$CFLAGS" \
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
Expand Down
15 changes: 6 additions & 9 deletions srcpkgs/perl-Barcode-ZBar/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
# Template file for 'perl-Barcode-ZBar'
pkgname=perl-Barcode-ZBar
version=0.23.1
revision=1
wrksrc="zbar-${version}/perl"
revision=2
wrksrc="zbar-$version"
build_wrksrc=perl
build_style=perl-module
hostmakedepends="perl"
makedepends="perl libzbar-devel"
depends="${makedepends}"
depends="perl"
short_desc="Perl interface to the ZBar Barcode Reader"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1"
license="LGPL-2.1-or-later"
homepage="https://metacpan.org/release/Barcode-ZBar"
distfiles="https://linuxtv.org/downloads/zbar/zbar-${version}.tar.bz2"
checksum=dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f

do_check() {
# Requires X display
:
}
make_check=no # requires X display