summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/ant/Makefile46
-rw-r--r--package/asterisk/Makefile4
-rw-r--r--package/at-spi2-atk/Makefile16
-rw-r--r--package/at-spi2-core/Makefile14
-rw-r--r--package/atk/Makefile35
-rw-r--r--package/barebox/Makefile18
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/cairo/Makefile77
-rw-r--r--package/cairo/patches/patch-Makefile_in20
-rw-r--r--package/cairo/patches/patch-configure101
-rw-r--r--package/cmake/Makefile6
-rw-r--r--package/ecj/Makefile43
-rw-r--r--package/enchant/Makefile6
-rw-r--r--package/enchant/patches/patch-src_Makefile_am12
-rw-r--r--package/enchant/patches/patch-src_Makefile_in22
-rw-r--r--package/fastjar/Makefile24
-rw-r--r--package/firefox/Makefile4
-rw-r--r--package/gcj/Makefile45
-rw-r--r--package/gdk-pixbuf/Makefile37
-rw-r--r--package/gdk-pixbuf/patches/patch-Makefile_in11
-rw-r--r--package/git/Makefile4
-rw-r--r--package/glib/Makefile23
-rw-r--r--package/glib/patches/patch-glib_gnulib_meson_build6
-rw-r--r--package/glib/patches/patch-meson_build10
-rw-r--r--package/gpgme/Makefile2
-rw-r--r--package/harfbuzz/Makefile4
-rw-r--r--package/irssi/Makefile9
-rw-r--r--package/jamvm/Makefile49
-rw-r--r--package/jikes/Makefile26
-rw-r--r--package/libffi/Makefile4
-rw-r--r--package/libgtk2/Makefile6
-rw-r--r--package/libgtk3/Makefile28
-rw-r--r--package/libiconv/Makefile2
-rw-r--r--package/libjpeg-turbo/Makefile1
-rw-r--r--package/libnotify/Makefile25
-rw-r--r--package/libpsl/Makefile32
-rw-r--r--package/libsoup/Makefile20
-rw-r--r--package/libxcb/Makefile4
-rw-r--r--package/mbedtls/Makefile30
-rw-r--r--package/mbedtls/patches/patch-Makefile35
-rw-r--r--package/mesa/Makefile14
-rw-r--r--package/mesa/patches/patch-meson_build23
-rw-r--r--package/meson/Makefile6
-rw-r--r--package/meson/src/cross-compilation.conf.in3
-rw-r--r--package/mongrel2/Makefile37
-rw-r--r--package/mongrel2/patches/patch-Makefile20
-rw-r--r--package/mongrel2/patches/patch-tools_m2sh_Makefile31
-rw-r--r--package/mongrel2/patches/patch-tools_procer_Makefile11
-rw-r--r--package/openjdk7/Makefile163
-rw-r--r--package/openjdk7/files/nss.cfg5
-rw-r--r--package/openjdk7/patches/openadk.patch896
-rw-r--r--package/openjdk8/Makefile120
-rw-r--r--package/openjdk8/files/openadk.patch295
-rw-r--r--package/pcre2/Makefile4
-rw-r--r--package/perl/Makefile6
-rw-r--r--package/pixman/Makefile20
-rw-r--r--package/pixman/patches/patch-Makefile_in11
-rw-r--r--package/pkgconf/Makefile6
-rw-r--r--package/pkgconf/patches/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch150
-rw-r--r--package/python-markupsafe/Makefile10
-rw-r--r--package/python3-setuptools/Makefile (renamed from package/python-setuptools/Makefile)14
-rw-r--r--package/python3-yaml/Makefile33
-rw-r--r--package/python3/Makefile20
-rw-r--r--package/quickjs/Makefile28
-rw-r--r--package/quickjs/patches/patch-Makefile29
-rw-r--r--package/ruby/Makefile6
-rw-r--r--package/strace/Makefile4
-rw-r--r--package/toolbox/src/lib/fgetln.h1
-rw-r--r--package/toolbox/src/sed/main.c1
-rw-r--r--package/tor/Makefile8
-rw-r--r--package/u-boot-avr32/Makefile18
-rw-r--r--package/u-boot/Makefile8
-rw-r--r--package/unifdef/Makefile37
-rw-r--r--package/unifdef/patches/patch-Makefile13
-rw-r--r--package/webkitgtk/Makefile16
-rw-r--r--package/wolfssl/Makefile10
-rw-r--r--package/xcb-proto/Makefile4
-rw-r--r--package/xcb-proto/patches/patch-xcb-proto_pc_in14
-rw-r--r--package/yaml/Makefile29
79 files changed, 657 insertions, 2330 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile
deleted file mode 100644
index b9d989ac3..000000000
--- a/package/ant/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= ant
-PKG_VERSION:= 1.8.4
-PKG_RELEASE:= 1
-PKG_HASH:= 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1
-PKG_DESCR:= java code build utility
-PKG_SECTION:= dev/tools
-HOST_BUILDDEP:= gcj-host
-PKG_SITES:= http://archive.apache.org/dist/ant/source/
-
-PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY
-
-DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
-WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE}))
-
-HOST_STYLE:= manual
-
-host-build:
- if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \
- cd $(WRKBUILD)/lib/optional; wget http://distfiles.openadk.org/junit-4.9b2.jar; \
- fi
- cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar
- (cd ${WRKBUILD}; \
- export ANT_OPTS="-Xms256m -Xmx256m" ;\
- export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\
- export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\
- export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\
- export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\
- $(BASH) ./build.sh)
-
-ant-hostinstall:
- cd $(WRKBUILD)/dist; \
- $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \
- $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib
-
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 5d9f10881..ced4fbacc 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 20.11.1
+PKG_VERSION:= 22.3.0
PKG_RELEASE:= 1
-PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9
+PKG_HASH:= 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593
PKG_DESCR:= open source pbx
PKG_SECTION:= net/voip
PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson
diff --git a/package/at-spi2-atk/Makefile b/package/at-spi2-atk/Makefile
index fd87d5d70..41ca90494 100644
--- a/package/at-spi2-atk/Makefile
+++ b/package/at-spi2-atk/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= at-spi2-atk
-PKG_VERSION:= 2.15.3
-PKG_EXTRAVER:= 2.15
-PKG_RELEASE:= 2
-PKG_HASH:= eaef8fcf2775e35e1e054840940808775dfa9b71bcd7bda1dd6ecbdf5b1a9e18
+PKG_VERSION:= 2.38.0
+PKG_EXTRAVER:= 2.38
+PKG_RELEASE:= 1
+PKG_HASH:= cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f
PKG_DESCR:= d-bus based accessibility framework
PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib libxtst
-PKG_BUILDDEP:= glib libXtst
+PKG_BUILDDEP:= meson-host glib libXtst
PKG_URL:= http://www.gnome.org/
PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-atk/$(PKG_EXTRAVER)/)
PKG_OPTS:= dev
@@ -20,6 +20,12 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,AT_SPI2_ATK,at-spi2-atk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:= meson
+BUILD_STYLE:= meson
+INSTALL_STYLE:= meson
+
at-spi2-atk-install:
$(INSTALL_DIR) $(IDIR_AT_SPI2_ATK)/usr/lib
$(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_ATK)/usr/lib
diff --git a/package/at-spi2-core/Makefile b/package/at-spi2-core/Makefile
index c6db623bf..29d2e40e9 100644
--- a/package/at-spi2-core/Makefile
+++ b/package/at-spi2-core/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= at-spi2-core
-PKG_VERSION:= 2.15.3
-PKG_EXTRAVER:= 2.15
+PKG_VERSION:= 2.56.0
+PKG_EXTRAVER:= 2.56
PKG_RELEASE:= 1
-PKG_HASH:= bae426d13d4a1ae3a35c6dd444e7fdef2159fbc9170eb39b6ae3213a27042d92
+PKG_HASH:= 80d7e8ea0be924e045525367f909d6668dfdd3e87cd40792c6cfd08e6b58e95c
PKG_DESCR:= d-bus based accessibility framework
PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib libxtst
-PKG_BUILDDEP:= glib libXtst libSM intltool-host
+PKG_BUILDDEP:= meson-host glib libXtst libSM intltool-host
PKG_NEEDS:= intl
PKG_URL:= http://www.gnome.org/
PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-core/$(PKG_EXTRAVER)/)
@@ -21,6 +21,12 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,AT_SPI2_CORE,at-spi2-core,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:= meson
+BUILD_STYLE:= meson
+INSTALL_STYLE:= meson
+
at-spi2-core-install:
$(INSTALL_DIR) $(IDIR_AT_SPI2_CORE)/usr/lib
$(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_CORE)/usr/lib
diff --git a/package/atk/Makefile b/package/atk/Makefile
deleted file mode 100644
index ad6335f1b..000000000
--- a/package/atk/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= atk
-PKG_VERSION:= 2.36.0
-PKG_EXTRAVER:= 2.36
-PKG_RELEASE:= 1
-PKG_HASH:= fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788
-PKG_DESCR:= accessibility toolkit library
-PKG_SECTION:= libs/misc
-PKG_BUILDDEP:= glib meson-host
-PKG_URL:= http://www.gnome.org/
-PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/)
-PKG_LIBNAME:= libatk
-PKG_OPTS:= dev
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBATK,libatk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-
-WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
-
-CONFIG_STYLE:= meson
-BUILD_STYLE:= meson
-INSTALL_STYLE:= meson
-
-MESON_FLAGS+= -Dintrospection=false
-
-libatk-install:
- $(INSTALL_DIR) $(IDIR_LIBATK)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libatk-*.so* $(IDIR_LIBATK)/usr/lib
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/barebox/Makefile b/package/barebox/Makefile
index b4490f1d6..6a78a32c4 100644
--- a/package/barebox/Makefile
+++ b/package/barebox/Makefile
@@ -4,15 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= barebox
-PKG_VERSION:= 2019.09.0
+PKG_VERSION:= 2025.03.0
PKG_RELEASE:= 1
-PKG_HASH:= beab6bdba2466bece57d23834daf4f0d530a594efc11ca0ddb69372981e6e159
+PKG_HASH:= 0bf7118004e445bdd57feeef89ee9064982acc221e8a046c4a7994d3da6da2ec
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
PKG_BUILDDEP:= lzop-host
PKG_URL:= http://www.barebox.org
PKG_SITES:= http://www.barebox.org/download/
+PKG_ARCH_DEPENDS:= aarch64 arm mips or1k ppc riscv32 riscv64 x86_64
+
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
@@ -25,15 +27,19 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
BAREBOX_ARCH:= $(ADK_TARGET_ARCH)
-ifeq ($(ADK_TARGET_ARCH_X86),y)
-CONFIG:= efi_defconfig
-endif
ifeq ($(ADK_TARGET_ARCH_X86_64),y)
CONFIG:= efi_defconfig
BAREBOX_ARCH:= x86
+BAREBOX:= barebox.efi
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y)
+ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y)
+CONFIG:= qemu-maltael_defconfig
+BAREBOX:= images/barebox-qemu-malta.img.swapped
+else
CONFIG:= qemu-malta_defconfig
+BAREBOX:= images/barebox-qemu-malta.img
+endif
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
CONFIG:= vexpress_ca9_defconfig
@@ -53,6 +59,6 @@ do-build:
$(MAKE))
barebox-install:
- $(CP) $(WRKBUILD)/barebox.bin $(FW_DIR)
+ $(CP) $(WRKBUILD)/$(BAREBOX) $(FW_DIR)
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 028fbdba6..9ed63b71f 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -584,7 +584,7 @@ config BUSYBOX_IPLINK
config BUSYBOX_FEATURE_IP_LINK_CAN
bool "ip link set type can"
- default y
+ default n
help
Configure CAN devices with "ip".
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 315766c57..09960903b 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,91 +4,34 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= cairo
-PKG_VERSION:= 1.14.6
+PKG_VERSION:= 1.18.2
PKG_RELEASE:= 1
-PKG_HASH:= 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252
+PKG_HASH:= a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a
PKG_DESCR:= graphics library
PKG_SECTION:= libs/image
PKG_DEPENDS:= fontconfig libfreetype libx11 pixman
-PKG_DEPENDS+= libxrender
+PKG_DEPENDS+= libxrender libpng
PKG_BUILDDEP:= pixman freetype fontconfig libX11 libXrender glib
-PKG_BUILDDEP+= libXext
+PKG_BUILDDEP+= libXext libpng
HOST_BUILDDEP:= libpng-host pixman-host freetype-host fontconfig-host
PKG_URL:= http://cairographics.org/
PKG_SITES:= http://cairographics.org/releases/
PKG_OPTS:= dev
-PKG_FLAVOURS_CAIRO:= WITH_PS WITH_PDF WITH_XML WITH_PNG WITH_TEE WITH_SVG WITH_XRENDER
-PKGFD_WITH_PS:= postscript support
-PKGFD_WITH_PDF:= pdf support
-PKGFD_WITH_XML:= xml support
-PKGFD_WITH_PNG:= png support
-PKGFB_WITH_PNG:= libpng
-PKGFS_WITH_PNG:= libpng
-PKGFD_WITH_TEE:= tee support
-PKGFD_WITH_SVG:= svg support
-PKGFD_WITH_XRENDER:= xorg xrender support
-
include ${ADK_TOPDIR}/mk/host.mk
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call HOST_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS+= --enable-ft=yes \
- --enable-png=yes \
- --enable-fc=yes \
- --enable-tee=no \
- --enable-xlib=no \
- --enable-pdf=no \
- --enable-quartz=no \
- --disable-test-surfaces \
- --disable-full-testing
+WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_XRENDER),)
-CONFIGURE_ARGS+= --enable-xlib-xrender=yes
-else
-CONFIGURE_ARGS+= --enable-xlib-xrender=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_SVG),)
-CONFIGURE_ARGS+= --enable-svg=yes \
- --enable-png=yes
-else
-CONFIGURE_ARGS+= --enable-svg=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PDF),)
-CONFIGURE_ARGS+= --enable-pdf=yes
-else
-CONFIGURE_ARGS+= --enable-pdf=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PS),)
-CONFIGURE_ARGS+= --enable-ps=yes
-else
-CONFIGURE_ARGS+= --enable-ps=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_PNG)$(ADK_PACKAGE_CAIRO_WITH_SVG),)
-CONFIGURE_ARGS+= --enable-png=yes
-else
-CONFIGURE_ARGS+= --enable-png=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_XML),)
-CONFIGURE_ARGS+= --enable-xml=yes
-else
-CONFIGURE_ARGS+= --enable-xml=no
-endif
-ifneq ($(ADK_PACKAGE_CAIRO_WITH_TEE),)
-CONFIGURE_ARGS+= --enable-tee=yes
-else
-CONFIGURE_ARGS+= --enable-tee=no
-endif
+MESON_FLAGS+= -Dtests=disabled
-CONFIGURE_ARGS+= --enable-ft=yes \
- --enable-fc=yes \
- --enable-xlib=yes \
- --enable-quartz=no \
- --disable-test-surfaces \
- --disable-full-testing
+HOST_STYLE:= meson
+CONFIG_STYLE:= meson
+BUILD_STYLE:= meson
+INSTALL_STYLE:= meson
cairo-install:
${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo
diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in
deleted file mode 100644
index 8716b0820..000000000
--- a/package/cairo/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- cairo-1.14.0.orig/Makefile.in 2014-10-14 03:47:28.000000000 +0200
-+++ cairo-1.14.0/Makefile.in 2015-02-26 11:39:05.000000000 +0100
-@@ -63,7 +63,7 @@ EXTRA_PROGRAMS =
- TESTS =
- check_PROGRAMS =
- # libpng is required for our test programs
--@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
-+@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
-@@ -417,7 +417,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
- # $(srcdir)/build/Makefile.win32.features-h \
- # $(NULL)
- ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
--DIST_SUBDIRS = src doc util boilerplate test perf
-+DIST_SUBDIRS = src doc util boilerplate perf
- SUBDIRS = src doc util $(am__append_1)
- DISTCHECK_CONFIGURE_FLAGS = \
- --enable-gtk-doc \
diff --git a/package/cairo/patches/patch-configure b/package/cairo/patches/patch-configure
deleted file mode 100644
index 9e0f39f0d..000000000
--- a/package/cairo/patches/patch-configure
+++ /dev/null
@@ -1,101 +0,0 @@
---- cairo-1.14.0.orig/configure 2014-10-14 03:47:29.000000000 +0200
-+++ cairo-1.14.0/configure 2015-02-26 13:27:59.000000000 +0100
-@@ -18371,7 +18371,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -18418,7 +18418,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -18469,7 +18469,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -18516,7 +18516,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -18585,7 +18585,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -18641,7 +18641,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -20089,7 +20089,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -20136,7 +20136,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -33208,7 +33208,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -33327,7 +33327,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ if false ; then
- cairo_cc_flag=no
- fi
-
-@@ -33408,7 +33408,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-- if test "x$cairo_cc_stderr" != "x"; then
-+ i