kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/lang/php5/patches/patch-an

64 lines
2.3 KiB
Text
Raw Normal View History

Get SSL support working on OpenSolaris. Unfortunately on OpenSolairs the OpenSSL install is split between /lib and /usr/include/openssl with plays havoc with the php ./configure as it assumes both have the same base directory (e.g. /usr). This patch uses a modified inbuilt check for OpenSSL instead of explicitly specifying a base using --with-openssl.
2009-02-07 19:03:00 +01:00
$NetBSD: patch-an,v 1.7 2009/02/07 18:03:00 adrianp Exp $
Fix the install path for the CGI binary so it ends up where we want it. Pointed out by schmonz@ and taca@ Bump PKGREVISION
2007-06-08 14:29:53 +02:00
Get SSL support working on OpenSolaris. Unfortunately on OpenSolairs the OpenSSL install is split between /lib and /usr/include/openssl with plays havoc with the php ./configure as it assumes both have the same base directory (e.g. /usr). This patch uses a modified inbuilt check for OpenSSL instead of explicitly specifying a base using --with-openssl.
2009-02-07 19:03:00 +01:00
--- configure.orig 2008-12-07 11:31:12.000000000 -0800
Fix the install path for the CGI binary so it ends up where we want it. Pointed out by schmonz@ and taca@ Bump PKGREVISION
2007-06-08 14:29:53 +02:00
+++ configure
Get SSL support working on OpenSolaris. Unfortunately on OpenSolairs the OpenSSL install is split between /lib and /usr/include/openssl with plays havoc with the php ./configure as it assumes both have the same base directory (e.g. /usr). This patch uses a modified inbuilt check for OpenSSL instead of explicitly specifying a base using --with-openssl.
2009-02-07 19:03:00 +01:00
@@ -12471,7 +12471,7 @@ EOF
Fix the install path for the CGI binary so it ends up where we want it. Pointed out by schmonz@ and taca@ Bump PKGREVISION
2007-06-08 14:29:53 +02:00
Update lang/php5 to 5.2.4 - miscellaneous security fixes and over 120 other bug fixes
2007-09-02 23:12:40 +02:00
echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6
Fix the install path for the CGI binary so it ends up where we want it. Pointed out by schmonz@ and taca@ Bump PKGREVISION
2007-06-08 14:29:53 +02:00
Update lang/php5 to 5.2.4 - miscellaneous security fixes and over 120 other bug fixes
2007-09-02 23:12:40 +02:00
- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
Fix the install path for the CGI binary so it ends up where we want it. Pointed out by schmonz@ and taca@ Bump PKGREVISION
2007-06-08 14:29:53 +02:00
PHP_SAPI=cgi
Get SSL support working on OpenSolaris. Unfortunately on OpenSolairs the OpenSSL install is split between /lib and /usr/include/openssl with plays havoc with the php ./configure as it assumes both have the same base directory (e.g. /usr). This patch uses a modified inbuilt check for OpenSSL instead of explicitly specifying a base using --with-openssl.
2009-02-07 19:03:00 +01:00
@@ -21467,7 +21467,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
fi
for i in $PHP_OPENSSL_DIR; do
@@ -34588,7 +34588,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
fi
for i in $PHP_OPENSSL_DIR; do
@@ -48878,7 +48878,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
fi
for i in $PHP_OPENSSL_DIR; do
@@ -87996,7 +87996,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
fi
for i in $PHP_OPENSSL_DIR; do
@@ -108297,12 +108297,7 @@ old_CC=$CC
Fix buildling ap-php with APACHE_MPM=worker
2008-10-28 08:07:58 +01:00
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
- cat >meta_ccld<<EOF
-#! /bin/sh
-exec $CC $ac_cv_pthreads_cflags \$@
-EOF
- CC="$abs_builddir/meta_ccld"
- chmod +x meta_ccld
+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
fi
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
Reference in a new issue Copy permalink