mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
app-office/libreoffice: fix build w/ gpgme 1.18.0, add which BDEPEND
- Fix build w/ gpgme 1.18.0 by spoofing existence of progress_callback (see bug for details; reported upstream but waiting for email to appear in archive/pending moderation) - Add which BDEPEND (bunch of configure checks use it for now) Closes: https://bugs.gentoo.org/865321 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -265,6 +265,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-apps/which
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
@@ -583,6 +584,9 @@ src_configure() {
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
|
||||
fi
|
||||
|
||||
# Workaround to fix build w/ gpgme 1.18.0, bug #865321
|
||||
export ac_cv_lib_gpgmepp_progress_callback=yes
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
|
||||
|
||||
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-apps/which
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
@@ -570,6 +571,9 @@ src_configure() {
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
|
||||
fi
|
||||
|
||||
# Workaround to fix build w/ gpgme 1.18.0, bug #865321
|
||||
export ac_cv_lib_gpgmepp_progress_callback=yes
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
|
||||
|
||||
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-apps/which
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
@@ -564,6 +565,9 @@ src_configure() {
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
|
||||
fi
|
||||
|
||||
# Workaround to fix build w/ gpgme 1.18.0, bug #865321
|
||||
export ac_cv_lib_gpgmepp_progress_callback=yes
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
|
||||
|
||||
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-apps/which
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
@@ -564,6 +565,9 @@ src_configure() {
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
|
||||
fi
|
||||
|
||||
# Workaround to fix build w/ gpgme 1.18.0, bug #865321
|
||||
export ac_cv_lib_gpgmepp_progress_callback=yes
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
|
||||
|
||||
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-apps/which
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
@@ -564,6 +565,9 @@ src_configure() {
|
||||
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
|
||||
fi
|
||||
|
||||
# Workaround to fix build w/ gpgme 1.18.0, bug #865321
|
||||
export ac_cv_lib_gpgmepp_progress_callback=yes
|
||||
|
||||
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
|
||||
|
||||
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
|
||||
|
||||
Reference in New Issue
Block a user