[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash macros/archflag.m4 configure.ac ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash macros/archflag.m4 configure.ac ChangeLog |
Date: |
Sun, 27 May 2007 23:41:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/05/27 23:41:48
Modified files:
macros : archflag.m4
. : configure.ac ChangeLog
Log message:
* macros/archflag.m4: Drop --with-gcc-arch, and use --with-cpu,
which is more standard.
* configure.ac: Add a --with-top-level option to specify where
development packages are when cross configuring. Add --with-cpu
to
set the compiler flags correctly when cross compiling for
similar
architectures, like pentium->geode, which are supported by the
same compiler.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/archflag.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.322&r2=1.323
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3373&r2=1.3374
Patches:
Index: macros/archflag.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/archflag.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/archflag.m4 9 Jan 2007 00:43:43 -0000 1.3
+++ macros/archflag.m4 27 May 2007 23:41:48 -0000 1.4
@@ -68,8 +68,11 @@
[AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_CANONICAL_HOST])
-AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use
architecture <arch> for gcc -march/-mtune, instead of guessing])],
- ax_gcc_arch=$withval, ax_gcc_arch=yes)
+if test x"${with_cpu}" != xnone ; then
+ ax_gcc_arch=${with_cpu}
+ ax_gcc_arch=yes
+ ax_cv_gcc_archflag="-march=${with_cpu}"
+fi
AC_MSG_CHECKING([for gcc architecture flag])
AC_MSG_RESULT([])
@@ -80,9 +83,9 @@
if test "$GCC" = yes; then
if test "x$ax_gcc_arch" = xyes; then
-ax_gcc_arch=""
-if test "$cross_compiling" = no; then
-case $host_cpu in
+ ax_gcc_arch=""
+ if test "$cross_compiling" = no; then
+ case $host_cpu in
i[[3456]]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
AX_GCC_X86_CPUID(0)
AX_GCC_X86_CPUID(1)
@@ -104,7 +107,7 @@
esac ;;
*f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
esac ;;
- *:68747541:*:*) # AMD
+ *:68747541:*:*|geode*) # AMD
case $ax_cv_gcc_x86_cpuid_1 in
*5[[67]]?:*:*:*) ax_gcc_arch=k6 ;;
*5[[8d]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -b -r1.322 -r1.323
--- configure.ac 22 May 2007 18:50:15 -0000 1.322
+++ configure.ac 27 May 2007 23:41:48 -0000 1.323
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.322 2007/05/22 18:50:15 martinwguy Exp $
+dnl $Id: configure.ac,v 1.323 2007/05/27 23:41:48 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -95,6 +95,9 @@
CXXFLAGS="$save_CXXFLAGS"
AC_LANG_POP(C++)
+dnl This is primarily used when compiling for a similar architecture,
+dnl like pentium->geode, which can use the same compiler, but have
+dnl different development
AC_ARG_WITH(top_level, AC_HELP_STRING([--with-top-level], [top level directory
for cross compiling files]), with_top_level=${withval})
AC_ARG_ENABLE(debugger,
@@ -110,6 +113,20 @@
fi
AM_CONDITIONAL(DEBUGGER, test x$debugger = xyes)
+AC_ARG_WITH(top_level, AC_HELP_STRING([--with-top-level], [top level directory
for cross compiling files]), with_top_level=${withval})
+
+AC_ARG_WITH(cpu,
+ AC_HELP_STRING([--with-cpu],[specify a cpu when cross compiling.]),
+ [case "${withval}" in
+ geode) with_cpu=geode ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --with-cpu option]) ;;
+ esac],with_cpu=none)
+
+if test x"$with_cpu" != x"none"; then
+dnl $CXXFLAGS="$CXXFLAGS -march=${with_cpu}"
+ cross_compiling=yes
+fi
+
AC_ARG_ENABLE(menus,
AC_HELP_STRING([--disable-menus],[Disable the GUI menus]),
[case "${enableval}" in
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3373
retrieving revision 1.3374
diff -u -b -r1.3373 -r1.3374
--- ChangeLog 27 May 2007 18:30:41 -0000 1.3373
+++ ChangeLog 27 May 2007 23:41:48 -0000 1.3374
@@ -1,3 +1,13 @@
+2007-05-27 Rob Savoye <address@hidden>
+
+ * macros/archflag.m4: Drop --with-gcc-arch, and use --with-cpu,
+ which is more standard.
+ * configure.ac: Add a --with-top-level option to specify where
+ development packages are when cross configuring. Add --with-cpu to
+ set the compiler flags correctly when cross compiling for similar
+ architectures, like pentium->geode, which are supported by the
+ same compiler.
+
2007-05-27 Bastiaan Jacques <address@hidden>
* libbase/{FLVParser.h, LoadThread.h, embedVideoDecoderFfmpeg.h,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash macros/archflag.m4 configure.ac ChangeLog,
Rob Savoye <=