[97762] trunk/dports/graphics/povray
ryandesign at macports.org
ryandesign at macports.org
Fri Sep 14 11:55:49 PDT 2012
Revision: 97762
http://trac.macports.org//changeset/97762
Author: ryandesign at macports.org
Date: 2012-09-14 11:55:49 -0700 (Fri, 14 Sep 2012)
Log Message:
-----------
povray: update to 3.7.0RC6 (#35949); add boost and openexr dependencies
Modified Paths:
--------------
trunk/dports/graphics/povray/Portfile
Added Paths:
-----------
trunk/dports/graphics/povray/files/patch-boost-1.50.diff
trunk/dports/graphics/povray/files/patch-configure-stat.diff
trunk/dports/graphics/povray/files/patch-lseek64.diff
trunk/dports/graphics/povray/files/patch-vfe-uint.diff
Removed Paths:
-------------
trunk/dports/graphics/povray/files/patch-configure
trunk/dports/graphics/povray/files/patch-source_png_pov.cpp
trunk/dports/graphics/povray/files/povray-3.6.1-libpng14.patch
Modified: trunk/dports/graphics/povray/Portfile
===================================================================
--- trunk/dports/graphics/povray/Portfile 2012-09-14 18:50:32 UTC (rev 97761)
+++ trunk/dports/graphics/povray/Portfile 2012-09-14 18:55:49 UTC (rev 97762)
@@ -5,9 +5,8 @@
PortGroup muniversal 1.0
name povray
-version 3.6.1
+version 3.7.0.RC6
set branch [join [lrange [split ${version} .] 0 1] .]
-revision 7
categories graphics
platforms darwin
maintainers nomaintainer
@@ -19,32 +18,39 @@
UNIX version, not the graphical Mac OS X version.
homepage http://www.povray.org/
-master_sites ${homepage}ftp/pub/povray/Official/Unix/ \
- ftp://ftp.povray.org/pub/povray/Official/Unix/
-use_bzip2 yes
+master_sites ${homepage}beta/source/
-checksums md5 b5789bb7eeaed0809c5c82d0efda571d \
- sha1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d
+checksums rmd160 1015f19cb48a7dea7dc51b842e3e391aa7eec450 \
+ sha256 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3
depends_build port:pkgconfig
-depends_lib port:xorg-libsm \
+depends_lib port:boost \
+ port:openexr \
+ port:xorg-libsm \
port:xpm \
port:libpng \
port:jpeg \
port:zlib \
port:tiff
-patchfiles patch-configure \
- patch-source_png_pov.cpp \
- povray-3.6.1-libpng14.patch
+patchfiles patch-boost-1.50.diff
-# uses its own cflags in addition to the ones we pass anyway
-configure.optflags
-configure.args --includedir=${prefix}/include \
- --mandir=${prefix}/share/man \
- COMPILED_BY="MacPorts"
+post-patch {
+ reinplace "s|3.7.0.RC5|${version}|g" ${worksrcpath}/VERSION ${worksrcpath}/configure
+}
+configure.env COMPILED_BY="MacPorts"
+configure.libs -lboost_system-mt
+configure.args --with-boost=${prefix} \
+ --with-boost-thread \
+ --with-libjpeg=${prefix} \
+ --with-libpng=${prefix} \
+ --with-libsdl=${prefix} \
+ --with-libtiff=${prefix} \
+ --with-openexr=${prefix} \
+ --with-zlib=${prefix}
+
post-destroot {
foreach f {povray.conf povray.ini} {
move ${destroot}${prefix}/etc/povray/${branch}/${f} \
@@ -83,6 +89,10 @@
}
platform darwin {
+ patchfiles-append patch-configure-stat.diff \
+ patch-lseek64.diff \
+ patch-vfe-uint.diff
+
if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
Added: trunk/dports/graphics/povray/files/patch-boost-1.50.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-boost-1.50.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-boost-1.50.diff 2012-09-14 18:55:49 UTC (rev 97762)
@@ -0,0 +1,111 @@
+--- source/backend/scene/view.cpp.orig 2012-06-10 06:53:44.000000000 -0500
++++ source/backend/scene/view.cpp 2012-09-05 05:07:51.000000000 -0500
+@@ -1550,7 +1550,7 @@
+ }
+
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.sec += 3;
+
+ // this will cause us to wait until the other threads are done.
+--- source/base/timer.cpp.orig 2012-02-05 14:54:15.000000000 -0600
++++ source/base/timer.cpp 2012-09-05 05:07:51.000000000 -0500
+@@ -117,7 +117,7 @@
+ POV_LONG TimerDefault::ElapsedRealTime() const
+ {
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
+ POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);
+ return ((tt - st) / (POV_LONG)(1000000));
+@@ -126,7 +126,7 @@
+ POV_LONG TimerDefault::ElapsedCPUTime() const
+ {
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
+ POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);
+ return ((tt - st) / (POV_LONG)(1000000));
+@@ -139,8 +139,8 @@
+
+ void TimerDefault::Reset()
+ {
+- boost::xtime_get(&realTimeStart, boost::TIME_UTC);
+- boost::xtime_get(&cpuTimeStart, boost::TIME_UTC);
++ boost::xtime_get(&realTimeStart, boost::TIME_UTC_);
++ boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_);
+ }
+
+ }
+@@ -155,7 +155,7 @@
+ void Delay(unsigned int msec)
+ {
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
+ t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
+ t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
+--- vfe/unix/platformbase.cpp.orig 2012-06-19 11:29:38.000000000 -0500
++++ vfe/unix/platformbase.cpp 2012-09-05 05:07:51.000000000 -0500
+@@ -126,7 +126,7 @@
+ #else
+ // taken from source/base/timer.cpp
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
+ t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
+ t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
+--- vfe/vfepovms.cpp.orig 2012-06-19 11:29:40.000000000 -0500
++++ vfe/vfepovms.cpp 2012-09-05 05:07:51.000000000 -0500
+@@ -247,7 +247,7 @@
+
+ // TODO: have a shorter wait but loop, and check for system shutdown
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.nsec += 50000000 ;
+ m_Event.timed_wait (lock, t);
+
+--- vfe/vfesession.cpp.orig 2012-06-19 11:29:40.000000000 -0500
++++ vfe/vfesession.cpp 2012-09-05 05:07:51.000000000 -0500
+@@ -967,7 +967,7 @@
+ if (WaitTime > 0)
+ {
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.sec += WaitTime / 1000 ;
+ t.nsec += (WaitTime % 1000) * 1000000 ;
+ m_SessionEvent.timed_wait (lock, t);
+@@ -1034,7 +1034,7 @@
+ // we can't call pause directly since it will result in a thread context
+ // error. pause must be called from the context of the worker thread.
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.sec += 3 ;
+ m_RequestFlag = rqPauseRequest;
+ if (m_RequestEvent.timed_wait(lock, t) == false)
+@@ -1057,7 +1057,7 @@
+ // we can't call resume directly since it will result in a thread context
+ // error. it must be called from the context of the worker thread.
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.sec += 3 ;
+ m_RequestFlag = rqResumeRequest;
+ if (m_RequestEvent.timed_wait(lock, t) == false)
+@@ -1123,7 +1123,7 @@
+ m_LastError = vfeNoError;
+
+ boost::xtime t;
+- boost::xtime_get (&t, boost::TIME_UTC);
++ boost::xtime_get (&t, boost::TIME_UTC_);
+ t.sec += 3 ;
+ #ifdef _DEBUG
+ t.sec += 120;
Deleted: trunk/dports/graphics/povray/files/patch-configure
===================================================================
--- trunk/dports/graphics/povray/files/patch-configure 2012-09-14 18:50:32 UTC (rev 97761)
+++ trunk/dports/graphics/povray/files/patch-configure 2012-09-14 18:55:49 UTC (rev 97762)
@@ -1,1011 +0,0 @@
---- configure.orig 2004-08-02 16:20:13.000000000 -0700
-+++ configure 2012-04-20 14:50:23.000000000 -0700
-@@ -10646,6 +10646,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "png.h"
- int main (void)
-@@ -10653,7 +10654,7 @@ int main (void)
- const char *version = png_get_libpng_ver(NULL)
- ;
- fprintf (stderr, "%s\n", version);
-- return ! (strcmp (version ? version : "", "$required_libpng_version") >= 0);
-+ return (system ("pkg-config --atleast-version=$required_libpng_version libpng"));
- }
-
-
-@@ -14889,990 +14890,8 @@ echo "${ECHO_T}$pov_prog_cc_flags_value"
- esac
- done
-
-- if test -z "$pov_arch"; then
-- case "$host" in
-- i486-*) pov_arch="i486";;
-- i586-*) pov_arch="pentium";; # for GCC / ICC
-- i686-*|i386-*) # FreeBSD seems to only report i386
-- pov_cpu=${pov_modelname:-`uname -p 2> /dev/null`}
-- case "$pov_cpu" in
-- # Intel
-- *pentium*4*|*xeon*) pov_arch="pentium4";; # for GCC / ICC
-- *pentium*mmx*) pov_arch="pentium";; # catch this first
-- *pentium*m*)
-- if test x"$CXX" = x"icc"; then
-- pov_arch="pentium4"
-- else
-- pov_arch="pentium-m"
-- fi
-- ;;
-- *pentium*iii*|*celeron*) # assume all celerons belong here
-- if test x"$CXX" = x"icc"; then
-- pov_arch="pentiumiii"
-- else
-- pov_arch="pentium3"
-- fi
-- ;;
-- *pentium*ii*)
-- if test x"$CXX" = x"icc"; then
-- pov_arch="pentiumii"
-- else
-- pov_arch="pentium2"
-- fi
-- ;;
-- *pentium*pro*) pov_arch="pentiumpro";; # for GCC / ICC
-- *pentium*) pov_arch="pentium";; # for GCC / ICC
-- # AMD
-- *athlon*xp*) pov_arch="athlon-xp";;
-- *athlon*mp*) pov_arch="athlon-mp";;
-- *athlon*|*duron*) pov_arch="athlon";;
-- # others
-- *) pov_arch="i686";; # don't support true i386
-- esac
-- pov_arch_fallback="i686"
-- ;;
-- k6-*) pov_arch="k6"; pov_arch_fallback="i686";;
-- k7-*) pov_arch="k7"; pov_arch_fallback="i686";;
-- k8-*|x86_64-*) pov_arch="k8"; pov_arch_fallback="i686";;
-- *) pov_arch="unknown";;
-- esac
-- fi
-- if test x"$pov_arch" != x"unknown"; then
--
--
--
-- # Create a unique cache-id name (multiple flags are handled).
-- pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo -march=$pov_arch -mtune=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
--
-- # Create the extended regular expression to handle multiple flags.
-- # For instance, "-first-flag -second-flag -X" gives the regexp:
-- # "\-f|irst-flag|\-s|econd-flag|\-X|X"
-- #
-- # FreeBSD and Darwin seem to have a problem with the \+ sed construct
-- # (but apparently not with the \{x,y\} one). For safety, I prefer to
-- # use [[:space:]][[:space:]]* for [[:space:]]\+
-- pov_prog_cxx_flags_regexp=`echo -march=$pov_arch -mtune=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
-- echo "$as_me:$LINENO: checking whether $CXX accepts -march=$pov_arch -mtune=$pov_arch" >&5
--echo $ECHO_N "checking whether $CXX accepts -march=$pov_arch -mtune=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cxx_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- # Create a conftest file for CXX.
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--
-- # Compile with $CXX and inspect standard error for given flags.
-- { ac_try='$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CXX -c -march=$pov_arch -mtune=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- # the command above seems to not always return the correct status, so
-- # for safety I rerun it here; I keep the other one for logging purpose.
-- pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cxx_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cxx_flags_var=yes"
-- else
-- eval "$pov_prog_cxx_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cxx_flags_value=\$$pov_prog_cxx_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cxx_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cxx_flags_value" >&6
--
-- # Update CXXFLAGS when flags are working, and run provided actions.
-- if test x"$pov_prog_cxx_flags_value" = x"yes"; then
-- CXXFLAGS="$CXXFLAGS -march=$pov_arch -mtune=$pov_arch"
--
-- if test "$subdirs"; then
-- {
--
--
--
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo -march=$pov_arch -mtune=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
-- pov_prog_cc_flags_regexp=`echo -march=$pov_arch -mtune=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- echo "$as_me:$LINENO: checking whether $CC accepts -march=$pov_arch -mtune=$pov_arch" >&5
--echo $ECHO_N "checking whether $CC accepts -march=$pov_arch -mtune=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cc_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
-- { ac_try='$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CC -c -march=$pov_arch -mtune=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cc_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cc_flags_var=yes"
-- else
-- eval "$pov_prog_cc_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cc_flags_value=\$$pov_prog_cc_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cc_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cc_flags_value" >&6
--
-- if test x"$pov_prog_cc_flags_value" = x"yes"; then
-- CFLAGS="$CFLAGS -march=$pov_arch -mtune=$pov_arch"
-- :
-- else
--
--
--
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
-- pov_prog_cc_flags_regexp=`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- echo "$as_me:$LINENO: checking whether $CC accepts -march=$pov_arch -mcpu=$pov_arch" >&5
--echo $ECHO_N "checking whether $CC accepts -march=$pov_arch -mcpu=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cc_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
-- { ac_try='$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CC -c -march=$pov_arch -mcpu=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cc_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cc_flags_var=yes"
-- else
-- eval "$pov_prog_cc_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cc_flags_value=\$$pov_prog_cc_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cc_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cc_flags_value" >&6
--
-- if test x"$pov_prog_cc_flags_value" = x"yes"; then
-- CFLAGS="$CFLAGS -march=$pov_arch -mcpu=$pov_arch"
-- :
-- else
-- :
-- fi
--
--
-- fi
--
-- }
-- fi
--
-- else
--
--
--
--
-- # Create a unique cache-id name (multiple flags are handled).
-- pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
--
-- # Create the extended regular expression to handle multiple flags.
-- # For instance, "-first-flag -second-flag -X" gives the regexp:
-- # "\-f|irst-flag|\-s|econd-flag|\-X|X"
-- #
-- # FreeBSD and Darwin seem to have a problem with the \+ sed construct
-- # (but apparently not with the \{x,y\} one). For safety, I prefer to
-- # use [[:space:]][[:space:]]* for [[:space:]]\+
-- pov_prog_cxx_flags_regexp=`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
-- echo "$as_me:$LINENO: checking whether $CXX accepts -march=$pov_arch -mcpu=$pov_arch" >&5
--echo $ECHO_N "checking whether $CXX accepts -march=$pov_arch -mcpu=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cxx_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- # Create a conftest file for CXX.
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--
-- # Compile with $CXX and inspect standard error for given flags.
-- { ac_try='$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CXX -c -march=$pov_arch -mcpu=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- # the command above seems to not always return the correct status, so
-- # for safety I rerun it here; I keep the other one for logging purpose.
-- pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cxx_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cxx_flags_var=yes"
-- else
-- eval "$pov_prog_cxx_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cxx_flags_value=\$$pov_prog_cxx_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cxx_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cxx_flags_value" >&6
--
-- # Update CXXFLAGS when flags are working, and run provided actions.
-- if test x"$pov_prog_cxx_flags_value" = x"yes"; then
-- CXXFLAGS="$CXXFLAGS -march=$pov_arch -mcpu=$pov_arch"
--
-- if test "$subdirs"; then
-- {
--
--
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
-- pov_prog_cc_flags_regexp=`echo -march=$pov_arch -mcpu=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- echo "$as_me:$LINENO: checking whether $CC accepts -march=$pov_arch -mcpu=$pov_arch" >&5
--echo $ECHO_N "checking whether $CC accepts -march=$pov_arch -mcpu=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cc_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
-- { ac_try='$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CC -c -march=$pov_arch -mcpu=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cc_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cc_flags_var=yes"
-- else
-- eval "$pov_prog_cc_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cc_flags_value=\$$pov_prog_cc_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cc_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cc_flags_value" >&6
--
-- if test x"$pov_prog_cc_flags_value" = x"yes"; then
-- CFLAGS="$CFLAGS -march=$pov_arch -mcpu=$pov_arch"
-- :
-- else
-- :
-- fi
-- }
-- fi
--
-- else
--
--
--
--
-- # Create a unique cache-id name (multiple flags are handled).
-- pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo -march=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
--
-- # Create the extended regular expression to handle multiple flags.
-- # For instance, "-first-flag -second-flag -X" gives the regexp:
-- # "\-f|irst-flag|\-s|econd-flag|\-X|X"
-- #
-- # FreeBSD and Darwin seem to have a problem with the \+ sed construct
-- # (but apparently not with the \{x,y\} one). For safety, I prefer to
-- # use [[:space:]][[:space:]]* for [[:space:]]\+
-- pov_prog_cxx_flags_regexp=`echo -march=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
-- echo "$as_me:$LINENO: checking whether $CXX accepts -march=$pov_arch" >&5
--echo $ECHO_N "checking whether $CXX accepts -march=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cxx_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- # Create a conftest file for CXX.
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--
-- # Compile with $CXX and inspect standard error for given flags.
-- { ac_try='$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CXX -c -march=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- # the command above seems to not always return the correct status, so
-- # for safety I rerun it here; I keep the other one for logging purpose.
-- pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cxx_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cxx_flags_var=yes"
-- else
-- eval "$pov_prog_cxx_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cxx_flags_value=\$$pov_prog_cxx_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cxx_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cxx_flags_value" >&6
--
-- # Update CXXFLAGS when flags are working, and run provided actions.
-- if test x"$pov_prog_cxx_flags_value" = x"yes"; then
-- CXXFLAGS="$CXXFLAGS -march=$pov_arch"
--
-- if test "$subdirs"; then
-- {
--
--
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo -march=$pov_arch | sed 's,[^a-zA-Z0-9],_,g'`
-- pov_prog_cc_flags_regexp=`echo -march=$pov_arch | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- echo "$as_me:$LINENO: checking whether $CC accepts -march=$pov_arch" >&5
--echo $ECHO_N "checking whether $CC accepts -march=$pov_arch... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cc_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
-- { ac_try='$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CC -c -march=$pov_arch conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cc_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cc_flags_var=yes"
-- else
-- eval "$pov_prog_cc_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cc_flags_value=\$$pov_prog_cc_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cc_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cc_flags_value" >&6
--
-- if test x"$pov_prog_cc_flags_value" = x"yes"; then
-- CFLAGS="$CFLAGS -march=$pov_arch"
-- :
-- else
-- :
-- fi
-- }
-- fi
--
-- else
--
-- if test "$pov_arch_fallback"; then
-- {
--
--
--
-- # Create a unique cache-id name (multiple flags are handled).
-- pov_prog_cxx_flags_var=pov_cv_prog_cxx_flags`echo -march=$pov_arch_fallback | sed 's,[^a-zA-Z0-9],_,g'`
--
-- # Create the extended regular expression to handle multiple flags.
-- # For instance, "-first-flag -second-flag -X" gives the regexp:
-- # "\-f|irst-flag|\-s|econd-flag|\-X|X"
-- #
-- # FreeBSD and Darwin seem to have a problem with the \+ sed construct
-- # (but apparently not with the \{x,y\} one). For safety, I prefer to
-- # use [[:space:]][[:space:]]* for [[:space:]]\+
-- pov_prog_cxx_flags_regexp=`echo -march=$pov_arch_fallback | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- # Cannot use AC_CACHE_CHECK due to the nature of the cache-id variable.
-- echo "$as_me:$LINENO: checking whether $CXX accepts -march=$pov_arch_fallback" >&5
--echo $ECHO_N "checking whether $CXX accepts -march=$pov_arch_fallback... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cxx_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- # Create a conftest file for CXX.
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--
-- # Compile with $CXX and inspect standard error for given flags.
-- { ac_try='$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CXX -c -march=$pov_arch_fallback conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- # the command above seems to not always return the correct status, so
-- # for safety I rerun it here; I keep the other one for logging purpose.
-- pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cxx_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cxx_flags_var=yes"
-- else
-- eval "$pov_prog_cxx_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cxx_flags_value=\$$pov_prog_cxx_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cxx_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cxx_flags_value" >&6
--
-- # Update CXXFLAGS when flags are working, and run provided actions.
-- if test x"$pov_prog_cxx_flags_value" = x"yes"; then
-- CXXFLAGS="$CXXFLAGS -march=$pov_arch_fallback"
-- if test "$subdirs"; then {
--
--
-- pov_prog_cc_flags_var=pov_cv_prog_cc_flags`echo $pov_arch_fallback | sed 's,[^a-zA-Z0-9],_,g'`
-- pov_prog_cc_flags_regexp=`echo $pov_arch_fallback | sed 's,\(-.\)\([^[:space:]]*\),\\\\\1|\2,g; s,[[:space:]][[:space:]]*,|,g; s,\(.\)||,\1|\1|,g; s,\(.\)|$,\1|\1,'`
--
-- echo "$as_me:$LINENO: checking whether $CC accepts $pov_arch_fallback" >&5
--echo $ECHO_N "checking whether $CC accepts $pov_arch_fallback... $ECHO_C" >&6
-- if eval "test \"\${$pov_prog_cc_flags_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
-- { ac_try='$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$CC -c $pov_arch_fallback conftest.$ac_ext > /dev/null 2> conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='cat conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- { ac_try='$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-- { ac_try='diff conftest.err0 conftest.err >&5'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }
-- if test -z "$pov_prog_cc_flags_err" \
-- || test -z "`diff conftest.err0 conftest.err`"; then
-- eval "$pov_prog_cc_flags_var=yes"
-- else
-- eval "$pov_prog_cc_flags_var=no"
-- fi
--
-- rm -f conftest.$ac_ext conftest.$ac_objext conftest.err conftest.err0
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--
-- eval "pov_prog_cc_flags_value=\$$pov_prog_cc_flags_var"
-- echo "$as_me:$LINENO: result: $pov_prog_cc_flags_value" >&5
--echo "${ECHO_T}$pov_prog_cc_flags_value" >&6
--
-- if test x"$pov_prog_cc_flags_value" = x"yes"; then
-- CFLAGS="$CFLAGS $pov_arch_fallback"
-- :
-- else
-- :
-- fi
-- }; fi
--
-- else
-- :
-- fi
--
-- }
-- fi
--
--
-- fi
--
--
--
-- fi
--
--
--
-- fi
--
-- fi
--
- # gcc says -malign-double makes no sense in the 64bit mode and reject it
-- for pov_flags in "-malign-double" "-minline-all-stringops"; do
-+ for pov_flags in "-minline-all-stringops"; do
-
-
-
Added: trunk/dports/graphics/povray/files/patch-configure-stat.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-configure-stat.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-configure-stat.diff 2012-09-14 18:55:49 UTC (rev 97762)
@@ -0,0 +1,13 @@
+--- configure.orig 2012-09-05 08:30:51.000000000 -0500
++++ configure 2012-09-05 08:39:33.000000000 -0500
+@@ -14043,8 +14043,8 @@
+ _ACEOF
+
+
+-povowner=`stat -c %u ${HOME}`
+-povgroup=`stat -c %g ${HOME}`
++povowner=`stat -f %u ${HOME}`
++povgroup=`stat -f %g ${HOME}`
+
+
+
Added: trunk/dports/graphics/povray/files/patch-lseek64.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-lseek64.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-lseek64.diff 2012-09-14 18:55:49 UTC (rev 97762)
@@ -0,0 +1,29 @@
+--- source/base/image/image.cpp.orig 2012-06-18 19:57:32.000000000 -0500
++++ source/base/image/image.cpp 2012-09-05 05:23:39.000000000 -0500
+@@ -2884,7 +2884,7 @@
+ meta[0] = sizeof(pixel_type);
+ meta[1] = m_Width;
+ meta[2] = m_Height;
+- if (lseek64(m_File, pos, SEEK_SET) != pos)
++ if (lseek(m_File, pos, SEEK_SET) != pos)
+ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed at creation.");
+ if (write(m_File, &meta[0], (int) sizeof(size_type)*3) != (sizeof(size_type)*3))
+ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed at creation.");
+@@ -3055,7 +3055,7 @@
+ #endif
+ pos = block * sizeof(pixel_type) * m_Blocksize;
+ int chunk = sizeof(pixel_type) * m_Blocksize;
+- if (lseek64(m_File, pos, SEEK_SET) != pos)
++ if (lseek(m_File, pos, SEEK_SET) != pos)
+ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file read/seek failed.");
+ int bytes = read(m_File, &m_Buffer[0], chunk);
+ if (bytes != (sizeof(pixel_type) * m_Blocksize))
+@@ -3078,7 +3078,7 @@
+
+ if (m_Dirty) {
+ pos = m_CurrentBlock * sizeof(pixel_type) * m_Blocksize;
+- if (lseek64(m_File, pos, SEEK_SET) != pos)
++ if (lseek(m_File, pos, SEEK_SET) != pos)
+ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write/seek failed.");
+ if (write(m_File, &m_Buffer[0], (int) sizeof(pixel_type) * m_Blocksize) != (sizeof(pixel_type) * m_Blocksize))
+ throw POV_EXCEPTION(kFileDataErr, "Intermediate image storage backing file write failed.");
Deleted: trunk/dports/graphics/povray/files/patch-source_png_pov.cpp
===================================================================
--- trunk/dports/graphics/povray/files/patch-source_png_pov.cpp 2012-09-14 18:50:32 UTC (rev 97761)
+++ trunk/dports/graphics/povray/files/patch-source_png_pov.cpp 2012-09-14 18:55:49 UTC (rev 97762)
@@ -1,11 +0,0 @@
---- source/png_pov.cpp.orig 2004-08-03 00:11:37.000000000 +0100
-+++ source/png_pov.cpp 2006-11-15 16:48:33.000000000 +0000
-@@ -782,7 +782,7 @@
- {
- // finished prematurely - trick into thinking done
- png_ptr->num_rows = png_ptr->row_number;
-- png_write_finish_row(png_ptr);
-+ png_write_row(png_ptr, row_ptr);
- }
-
- #ifdef POV_COMMENTS // temporarily skip comment writing code
Added: trunk/dports/graphics/povray/files/patch-vfe-uint.diff
===================================================================
--- trunk/dports/graphics/povray/files/patch-vfe-uint.diff (rev 0)
+++ trunk/dports/graphics/povray/files/patch-vfe-uint.diff 2012-09-14 18:55:49 UTC (rev 97762)
@@ -0,0 +1,22 @@
+--- vfe/unix/vfeplatform.h.orig 2012-06-19 11:29:39.000000000 -0500
++++ vfe/unix/vfeplatform.h 2012-09-05 08:19:08.000000000 -0500
+@@ -94,6 +94,8 @@
+ #ifndef __VFEPLATFORM_H__
+ #define __VFEPLATFORM_H__
+
++#include <sys/types.h>
++
+ #include <boost/shared_ptr.hpp>
+
+ namespace vfePlatform
+--- vfe/vfesession.h.orig 2012-06-19 11:29:40.000000000 -0500
++++ vfe/vfesession.h 2012-09-05 08:19:13.000000000 -0500
+@@ -94,6 +94,8 @@
+ #ifndef __VFESESSION_H__
+ #define __VFESESSION_H__
+
++#include <sys/types.h>
++
+ #include <queue>
+
+ #include "base/image/colourspace.h"
Deleted: trunk/dports/graphics/povray/files/povray-3.6.1-libpng14.patch
===================================================================
--- trunk/dports/graphics/povray/files/povray-3.6.1-libpng14.patch 2012-09-14 18:50:32 UTC (rev 97761)
+++ trunk/dports/graphics/povray/files/povray-3.6.1-libpng14.patch 2012-09-14 18:55:49 UTC (rev 97762)
@@ -1,20 +0,0 @@
---- source/png_pov.cpp
-+++ source/png_pov.cpp
-@@ -1428,7 +1428,7 @@
- if(r_info_ptr->valid & PNG_INFO_tRNS)
- {
- for (index = 0; index < r_info_ptr->num_trans; index++)
-- cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- }
-
- Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1461,7 +1461,7 @@
- if(r_info_ptr->valid & PNG_INFO_tRNS)
- {
- for (index = 0; index < r_info_ptr->num_trans; index++)
-- cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+ cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- }
-
- Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120914/bf717ab3/attachment-0001.html>
More information about the macports-changes
mailing list