dartmouth] Dude 658 $ svn diff X264
Index: X264/20080309/2245/Solaris/configure.sh
===================================================================
--- X264/20080309/2245/Solaris/configure.sh (revision 1770)
+++ X264/20080309/2245/Solaris/configure.sh (working copy)
@@ -1,7 +1,7 @@
#! /bin/sh
cd 2245
-CFLAGS="$CPPFLAGS -DUSE_SOLARIS -DVISUALIZE=1 -DHAVE_MALLOC_H
-DHAVE_PTHREAD -DSYS_SunOS -DHAVE_MMX $CFLAGS -xc99 "
+CFLAGS="$CPPFLAGS -DUSE_SOLARIS -DVISUALIZE=1 -DHAVE_MALLOC_H
-DHAVE_PTHREAD -DSYS_SunOS $CFLAGS -xc99 "
LDFLAGS="$LDFLAGS ${_xorg_lib_path} -lX11 -lsunmath"
export CFLAGS LDFLAGS
@@ -13,6 +13,7 @@
fi
if [ $the_arch = "x86" ] ; then
+ CFLAGS="-DHAVE_MMX $CFLAGS"
if [ $_libdir = "/opt/foss/lib/amd64" ] ; then
host_cpu=x86_64
else
dartmouth] Dude 659 $
libshout is pretty busted for sparcv9, it defines -xvis=yes
-xarch=sparcvis which the compiler is unhappy with, and even worse the
default configure adds a -xcg92 to its compile line, which needs to be
removed. I have a simple patch for the latter, but the first is a bit
messier, since I don't really know what compiler options you are shooting
for.
Just removing xcg92 seems pretty safe, there's already a -fast. It sounds
like you want to strip that too though.
artmouth] Solaris 876 $ svn diff
Index: diffs/configure.sparcv9
===================================================================
--- diffs/configure.sparcv9 (revision 0)
+++ diffs/configure.sparcv9 (revision 0)
@@ -0,0 +1,30 @@
+Index: configure
+===================================================================
+--- configure (revision 1770)
++++ configure (working copy)
+@@ -18707,8 +18707,8 @@
+ ;;
+ sparc-sun-solaris*)
+ DEBUG="-v -g"
+- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92
-Dsuncc"
++ CFLAGS="-xO4 -fast -w -fsimple -native "
++ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -Dsuncc"
+ ;;
+ *)
+ DEBUG="-g"
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 1770)
++++ configure.ac (working copy)
+@@ -55,8 +55,8 @@
+ ;;
+ sparc-sun-solaris*)
+ DEBUG="-v -g"
+- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92
-Dsuncc"
++ CFLAGS="-xO4 -fast -w -fsimple -native "
++ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple
-Dsuncc"
+ ;;
+ *)
+ DEBUG="-g"
Index: apply_patches
===================================================================
--- apply_patches (revision 1771)
+++ apply_patches (working copy)
@@ -12,3 +12,9 @@
/usr/bin/gpatch -p1 < ./Solaris/diffs/$file
done
+for file in \
+ configure.sparcv9
+do
+ echo "Applying patch $file."
+ /usr/bin/gpatch -p 0 < ./Solaris/diffs/$file
+done
-- Dave
