summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/libcdr/UnpackedTarball_libcdr.mk1
-rw-r--r--external/libcdr/ax_gcc_func_attribute.m4.patch11
-rw-r--r--external/libqxp/UnpackedTarball_libqxp.mk3
-rw-r--r--external/libqxp/ax_gcc_func_attribute.m4.patch11
4 files changed, 26 insertions, 0 deletions
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index 778fd9eca123..d8742f3c5f5a 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
external/libcdr/libcdr-visibility-win.patch \
external/libcdr/libcdr-no-icu-boolean.patch.1 \
+ external/libcdr/ax_gcc_func_attribute.m4.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ax_gcc_func_attribute.m4.patch b/external/libcdr/ax_gcc_func_attribute.m4.patch
new file mode 100644
index 000000000000..37f4edf0bd46
--- /dev/null
+++ b/external/libcdr/ax_gcc_func_attribute.m4.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -19167,7 +19167,7 @@
+
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+- if test -s conftest.err; then :
++ if grep -- -Wattributes conftest.err; then :
+ ax_cv_have_func_attribute_visibility=no
+ else
+ ax_cv_have_func_attribute_visibility=yes
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk
index 0ac69bc6f079..9f111bcb2b81 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -13,8 +13,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL)))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0))
+
$(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
external/libqxp/android-workaround.patch.1 \
+ external/libcdr/ax_gcc_func_attribute.m4.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/ax_gcc_func_attribute.m4.patch b/external/libqxp/ax_gcc_func_attribute.m4.patch
new file mode 100644
index 000000000000..8f7457816efd
--- /dev/null
+++ b/external/libqxp/ax_gcc_func_attribute.m4.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -18136,7 +18136,7 @@
+
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+- if test -s conftest.err; then :
++ if grep -- -Wattributes conftest.err; then :
+ ax_cv_have_func_attribute_visibility=no
+ else
+ ax_cv_have_func_attribute_visibility=yes