diff options
| author | jlam <jlam> | 2004-12-09 14:50:23 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-12-09 14:50:23 +0000 |
| commit | 83c22f25354daa2e938211c2586abc6285a36894 (patch) | |
| tree | e333161159aa5be4db4f3a1f6a3968f79cf3ed59 /www | |
| parent | 1a8ad76299a1f07221ad72fd66b77285fdaa2308 (diff) | |
| download | pkgsrc-83c22f25354daa2e938211c2586abc6285a36894.tar.gz | |
When apache2 is built with the "worker" MPM, the PHP4 configure script
creates its own compiler wrapper script. This "meta_ccld" script
isn't recognized by the installed libtool script as a compiler, and
libtool gets confused as to which compiler tag to use. Rather than
inserting "--tag=CC" into the Makefiles, we patch the configure script
to not make the wrapper script, and instead, to simply append the
appropriate pthreads CFLAGS to the normal CFLAGS variable subsituted
into Makefiles. This fixes PR pkg/28485.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php4/distinfo | 3 | ||||
| -rw-r--r-- | www/php4/patches/patch-ad | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/www/php4/distinfo b/www/php4/distinfo index 8eeb9b7a4c3..578edff9d94 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.33 2004/10/31 18:23:24 jdolecek Exp $ +$NetBSD: distinfo,v 1.34 2004/12/09 14:50:23 jlam Exp $ SHA1 (php-4.3.9.tar.bz2) = 9995ce1f0b84a6d3c230552446dbcd91dbf426b0 Size (php-4.3.9.tar.bz2) = 4001681 bytes SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407 SHA1 (patch-ab) = fd09b2a1f56d50859f2ee632f7feab28e624fe15 +SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931 SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad new file mode 100644 index 00000000000..31c3107023a --- /dev/null +++ b/www/php4/patches/patch-ad @@ -0,0 +1,19 @@ +$NetBSD: patch-ad,v 1.17 2004/12/09 14:50:23 jlam Exp $ + +--- configure.orig 2004-09-20 18:31:33.000000000 -0400 ++++ configure +@@ -90314,13 +90314,8 @@ old_CC=$CC + + if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then + CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" ++ CFLAGS="$CFLAGS $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 + fi + + if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then |