diff options
author | Karel Kočí <cynerd@email.cz> | 2021-07-22 09:09:46 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2021-07-22 09:09:46 +0200 |
commit | 4371a7096c72d8c91e3f4122075412c59881da2f (patch) | |
tree | 11d2f2d4021b660c8ffedd7c3f694fb53b58f16b /net-libs/libsoup/files | |
parent | ff4f175e708adbe8d1b117cceca7a5ec0409d864 (diff) | |
download | gentoo-personal-overlay-4371a7096c72d8c91e3f4122075412c59881da2f.tar.gz gentoo-personal-overlay-4371a7096c72d8c91e3f4122075412c59881da2f.tar.bz2 gentoo-personal-overlay-4371a7096c72d8c91e3f4122075412c59881da2f.zip |
net-libs/libsoup: try newer version
Diffstat (limited to 'net-libs/libsoup/files')
-rw-r--r-- | net-libs/libsoup/files/disable-apache-tests.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch new file mode 100644 index 0000000..e7d306b --- /dev/null +++ b/net-libs/libsoup/files/disable-apache-tests.patch @@ -0,0 +1,33 @@ +From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 23 Aug 2019 21:11:57 +0300 +Subject: [PATCH] meson: Force disable apache/php using tests for now + +We had them disabled in autotools with a sed. Keep them disabled for now +in meson port as well. Should be revisited at some point. +--- + meson.build | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 89837c15..f0e34cb0 100644 +--- a/meson.build ++++ b/meson.build +@@ -162,12 +162,9 @@ endif + # + # The summary is that for the configuration parsing we will use the apachectl, + # but for running the tests we will use the httpd binary. +-apachectl = find_program('apachectl', '/sbin/apachectl', '/usr/sbin/apachectl', required : false) ++apachectl = disabler() + # This abomination is a result of https://github.com/mesonbuild/meson/issues/1576 +-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache', +- '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache', +- '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', '/usr/sbin/apache', +- required : false) ++apache_httpd2 = disabler() + have_apache=false + apache_httpd2_version = '' + if apache_httpd2.found() and apachectl.found() +-- +2.20.1 + |