Skip to content

Commit

Permalink
www-servers/lighttpd: fix meson typo in src/
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/905219
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed Jun 25, 2023
1 parent d3715f1 commit e753fa7
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 0 deletions.
29 changes: 29 additions & 0 deletions www-servers/lighttpd/files/lighttpd-1.4.69-fix-meson-typo.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
https://github.com/lighttpd/lighttpd1.4/pull/127

From 7445f72eb441052f7051f029b25d39855dc75e1c Mon Sep 17 00:00:00 2001
From: Sam James <[email protected]>
Date: Sun, 25 Jun 2023 06:18:40 +0100
Subject: [PATCH] src: Fix 'getoption' meson typo

Bug: https://bugs.gentoo.org/905219
--- a/src/meson.build
+++ b/src/meson.build
@@ -381,7 +381,7 @@ if get_option('with_gnutls')
# function: gnutls_check_version (-lgnutls)
libgnutls = [ dependency('gnutls') ]
conf_data.set('HAVE_GNUTLS_CRYPTO_H', true)
- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle'))
+ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle'))
libcrypto = [ dependency('gnutls') ]
endif
endif
@@ -402,7 +402,7 @@ if get_option('with_nss')
#libnss3 = [ compiler.find_library('nss3') ]
#libnssutil3 = [ compiler.find_library('nssutil3') ]
conf_data.set('HAVE_NSS3_NSS_H', true)
- if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(getoption('with_nettle')) and not(getoption('with_gnutls'))
+ if not(get_option('with_openssl')) and not(get_option('with_wolfssl')) and not(get_option('with_mbedtls')) and not(get_option('with_nettle')) and not(get_option('with_gnutls'))
libcrypto = [ dependency('nss') ]
endif
endif

4 changes: 4 additions & 0 deletions www-servers/lighttpd/lighttpd-1.4.69.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ BDEPEND="
test? ( virtual/perl-Test-Harness )
"

PATCHES=(
"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch
)

# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="${ED}/etc/lighttpd/lighttpd.conf"
Expand Down
4 changes: 4 additions & 0 deletions www-servers/lighttpd/lighttpd-1.4.70.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ BDEPEND="
test? ( virtual/perl-Test-Harness )
"

PATCHES=(
"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch
)

# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="${ED}/etc/lighttpd/lighttpd.conf"
Expand Down
4 changes: 4 additions & 0 deletions www-servers/lighttpd/lighttpd-1.4.71.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ BDEPEND="
test? ( virtual/perl-Test-Harness )
"

PATCHES=(
"${FILESDIR}"/${PN}-1.4.69-fix-meson-typo.patch
)

# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="${ED}/etc/lighttpd/lighttpd.conf"
Expand Down

0 comments on commit e753fa7

Please sign in to comment.