From fcdaf2de74807f313a8436140d5ab98367086aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 7 Feb 2021 22:30:35 +0100 Subject: [PATCH] openjdk8: fix cross build 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. --- srcpkgs/openjdk8/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 30b7fdd3131..478986b3ca6 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -30,7 +30,8 @@ configure_args=" --with-vendor-name="Void" --with-vendor-url="https://voidlinux.org/" --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" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates zlib-devel make-ca which" @@ -199,8 +200,6 @@ do_configure() { ;; esac - configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/} - ./configure ${configure_args} --with-extra-cflags="$CFLAGS" \ --with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS" }