diff options
| author | adam <adam> | 2008-10-28 07:07:58 +0000 |
|---|---|---|
| committer | adam <adam> | 2008-10-28 07:07:58 +0000 |
| commit | 8fc8136cb67f8b3531534dabf4b87c52ecba70ab (patch) | |
| tree | 88853b2090c0a6c92200447c4a9941abee37f444 /lang | |
| parent | 9ca8736684cdb5a1146249346b79513966a64229 (diff) | |
| download | pkgsrc-8fc8136cb67f8b3531534dabf4b87c52ecba70ab.tar.gz | |
Fix buildling ap-php with APACHE_MPM=worker
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/distinfo | 4 | ||||
| -rw-r--r-- | lang/php5/patches/patch-an | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/lang/php5/distinfo b/lang/php5/distinfo index f09d5408338..34967e8efc4 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2008/05/04 16:50:44 adrianp Exp $ +$NetBSD: distinfo,v 1.53 2008/10/28 07:07:58 adam Exp $ SHA1 (php-5.2.6/php-5.2.6.tar.bz2) = 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 RMD160 (php-5.2.6/php-5.2.6.tar.bz2) = 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b @@ -10,6 +10,6 @@ SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-ak) = e3c654de196dc4b693b2d95e3ee131fa147125bc SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 -SHA1 (patch-an) = f07a08f8ee1a18f6371af9bd6c482d936e9220e4 +SHA1 (patch-an) = d0578fa2d00932d6b5d97dfff525f4c0f9586bd5 SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an index ff1cbbaf9c7..9b170275bc8 100644 --- a/lang/php5/patches/patch-an +++ b/lang/php5/patches/patch-an @@ -1,6 +1,6 @@ -$NetBSD: patch-an,v 1.5 2007/09/02 21:12:42 jdolecek Exp $ +$NetBSD: patch-an,v 1.6 2008/10/28 07:07:59 adam Exp $ ---- configure.orig 2007-09-02 19:32:56.000000000 +0200 +--- configure.orig 2008-04-30 20:37:32.000000000 +0200 +++ configure @@ -12437,7 +12437,7 @@ EOF @@ -11,3 +11,17 @@ $NetBSD: patch-an,v 1.5 2007/09/02 21:12:42 jdolecek Exp $ PHP_SAPI=cgi +@@ -107515,12 +107515,7 @@ old_CC=$CC + 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 |