wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openjdk8: fix cross build

Browse source 
The expression to strip "--with-libtool-sysroot=..." from configure_args
actually stripped all the configure_args defined in the template.
To avoid this unwanted side effect use --disable-option-checking.
This commit is contained in:
Jürgen Buchmüller 2021-02-07 22:30:35 +01:00
parent 022f75d23c
commit fcdaf2de74
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/openjdk8/template
View file

@ -30,7 +30,8 @@ configure_args="
--with-vendor-name="Void" --with-vendor-name="Void"
--with-vendor-url="https://voidlinux.org/" --with-vendor-url="https://voidlinux.org/"
--with-vendor-bug-url="https://github.com/void-linux/void-packages/issues" --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
--with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"" --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"
--disable-option-checking"
make_build_args="images $(vopt_if docs docs) COMPILER_WARNINGS_FATAL=false" make_build_args="images $(vopt_if docs docs) COMPILER_WARNINGS_FATAL=false"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
zlib-devel make-ca which" zlib-devel make-ca which"
@ -199,8 +200,6 @@ do_configure() {
;; ;;
esac esac
configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/}
./configure ${configure_args} --with-extra-cflags="$CFLAGS" \ ./configure ${configure_args} --with-extra-cflags="$CFLAGS" \
--with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS" --with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS"
} }