Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 147952 Details for
Bug 215671
dev-php5/magickwand-1.0.7 doesn't compile with media-gfx/imagemagick-6.3.9.7: magick-wand.h not found
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
First attempt at patch, won't work
1.0.6-Wand-config.patch (text/plain), 2.50 KB, created by
Martin von Gagern
on 2008-04-01 10:11:23 UTC
(
hide
)
Description:
First attempt at patch, won't work
Filename:
MIME Type:
Creator:
Martin von Gagern
Created:
2008-04-01 10:11:23 UTC
Size:
2.50 KB
patch
obsolete
>--- MagickWandForPHP-1.0.6.orig/config.m4 2008-04-01 09:56:03.000000000 +0200 >+++ MagickWandForPHP-1.0.6/config.m4 2008-04-01 10:49:43.000000000 +0200 >@@ -26,14 +26,15 @@ > fi > fi > >- WAND_DIR=`$WAND_CONFIG_PATH/Wand-config --prefix` >- AC_MSG_CHECKING(for magick-wand.h header file) >- >- if test -r $WAND_DIR/include/wand/magick-wand.h; then >- AC_MSG_RESULT(found in $WAND_DIR/include/wand/magick-wand.h) >- else >- AC_MSG_ERROR(Cannot locate header file magick-wand.h) >- fi >+ AC_MSG_CHECKING(Wand-config --cppflags) >+ WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`" >+ AC_MSG_RESULT($WAND_CPPFLAGS) >+ ORIG_CFLAGS="$CPPFLAGS" >+ CPPFLAGS="$ORIG_CPPFLAGS $WAND_CPPFLAGS" >+ dnl AC_MSG_CHECKING(for magick-wand.h header file) >+ AC_CHECK_HEADER(wand/magick-wand.h, PHP_EVAL_INCLINE($WAND_CPPFLAGS), >+ AC_MSG_ERROR(Cannot locate header file magick-wand.h)) >+ CPPFLAGS="$ORIG_CPPFLAGS" > > > IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version` >@@ -75,7 +76,6 @@ > > PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD) > PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD) >- PHP_ADD_INCLUDE($WAND_DIR/include) > PHP_SUBST(MAGICKWAND_SHARED_LIBADD) > PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared) > >--- MagickWandForPHP-1.0.6.orig/aclocal.m4 2008-04-01 11:44:12.000000000 +0200 >+++ MagickWandForPHP-1.0.6/aclocal.m4 2008-04-01 11:49:30.000000000 +0200 >@@ -46,9 +46,7 @@ > dnl execute code, if variable is not set in namespace > dnl > AC_DEFUN([PHP_RUN_ONCE],[ >- changequote({,}) >- unique=`echo $2|$SED 's/[^a-zA-Z0-9]/_/g'` >- changequote([,]) >+ unique=`echo $2|$SED 's/@<:@^a-zA-Z0-9@:>@/_/g'` > cmd="echo $ac_n \"\$$1$unique$ac_c\"" > if test -n "$unique" && test "`eval $cmd`" = "" ; then > eval "$1$unique=set" >@@ -65,9 +63,7 @@ > if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then > $2=$1 > else >- changequote({,}) >- ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`" >- changequote([,]) >+ ep_dir="`echo $1|$SED 's%/*@<:@^/@:>@@<:@^/@:>@*/*$%%'`" > ep_realdir="`(cd \"$ep_dir\" && pwd)`" > $2="$ep_realdir/`basename \"$1\"`" > fi >@@ -358,9 +354,7 @@ > dnl Stores the location of libgcc in libgcc_libpath > dnl > AC_DEFUN([PHP_LIBGCC_LIBPATH],[ >- changequote({,}) >- libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'` >- changequote([,]) >+ libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*@<:@^/@:>@@<:@^/|:>@*$%%'` > ]) > > dnl -------------------------------------------------------------------------
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 215671
:
147952
|
149560
|
149581
|
156089
|
156211