summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephanie J. Lockwood-Childs <wormo@gentoo.org>2009-08-13 06:40:44 +0000
committerStephanie J. Lockwood-Childs <wormo@gentoo.org>2009-08-13 06:40:44 +0000
commit0957304f2308c39f7f12d8045266fea57493841a (patch)
tree251c03c966eee4bd8af94bd303dca23511be2ae9 /www-client/lynx/files
parentResize the patch. (diff)
downloadgentoo-2-0957304f2308c39f7f12d8045266fea57493841a.tar.gz
gentoo-2-0957304f2308c39f7f12d8045266fea57493841a.tar.bz2
gentoo-2-0957304f2308c39f7f12d8045266fea57493841a.zip
Patch lynx configure script to prevent build failure when openssl
is compiled with USE=kerberos (bug #267749, thanks to Guy for testing) (Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'www-client/lynx/files')
-rw-r--r--www-client/lynx/files/lynx-2.8.7-configure-openssl.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch b/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch
new file mode 100644
index 000000000000..55bbb695bfd6
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch
@@ -0,0 +1,33 @@
+--- configure.old 2009-07-31 00:12:26.000000000 -0700
++++ configure 2009-07-31 00:10:05.000000000 -0700
+@@ -11763,16 +11763,23 @@
+ if test -n "$cf_cflags_ssl" ; then
+ case "$cf_cflags_ssl" in #(vi
+ *-I*) #(vi
+- cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+- ;;
+- *)
+- cf_cv_header_path_ssl=/usr/include
++ # if openssl pkg-config lists more than one includedir,
++ # primary one will be first
++ # (e.g. kerberos includedir may follow)
++ # so, pick out path following first '-I'
++ cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/\(-I[^ ]*\).*/\1/' -e 's/.*-I//'`
++ cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
+ ;;
+ esac
+- if test -d $cf_cv_header_path_ssl/openssl ; then
+- cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
++ # try standard location if couldn't
++ # figure out path using pkg-config
++ if ! test -d "$cf_cv_header_path_ssl" ; then
++ if test -d "/usr/include/openssl" ; then
++ cf_cv_header_path_ssl=/usr/include/openssl
++ else
++ cf_cv_header_path_ssl=/usr/include
++ fi
+ fi
+-
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=