[Ocfs2-tools-commits] manish commits r608 - in trunk: . extras tunefs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-27 16:35:20 -0600 (Thu, 27 Jan 2005)
New Revision: 608

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/extras/Makefile
   trunk/toolsarch.guess
   trunk/tunefs.ocfs2/Makefile
Log:
Ditch OCFS_PROCESSOR, and only warn instead of error for unsupported arch
in configure


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-27 19:25:18 UTC (rev 607)
+++ trunk/Config.make.in	2005-01-27 22:35:20 UTC (rev 608)
@@ -53,6 +53,5 @@
 BUILD_DEBUGOCFS2 = @BUILD_DEBUGOCFS2@
 
 OCFS_DEBUG = @OCFS_DEBUG@
-OCFS_PROCESSOR = @OCFS_PROCESSOR@
 
 OCFS2_DEBUG_EXE = @OCFS2_DEBUG_EXE@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-27 19:25:18 UTC (rev 607)
+++ trunk/configure.in	2005-01-27 22:35:20 UTC (rev 608)
@@ -29,8 +29,6 @@
 
 AC_CANONICAL_HOST
 
-OCFS_PROCESSOR=
-
 case "$host" in
   *-*-linux*)
     ;;
@@ -39,43 +37,20 @@
     ;;
 esac
 
-case "$host_cpu" in
-  powerpc64)
-    OCFS_PROCESSOR="ppc64"
-    ;;
-  ia64)
-    OCFS_PROCESSOR="ia64"
-    ;;
-  x86_64)
-    OCFS_PROCESSOR="x86_64"
-    ;;
-  i386|i486|i586|i686|i786|k6|k7)
-    OCFS_PROCESSOR="i686"
-    ;;
-  s390x)
-    OCFS_PROCESSOR="s390x"
-    ;;
-  *)
-    AC_MSG_ERROR([not configured for "$host_cpu"])
-    ;;
-esac
-
-AC_SUBST(OCFS_PROCESSOR)
-
 if test -z "$TOOLSARCH"; then
     case "$host_cpu" in
-    x86_64|i386|ppc|ia64|s390x)
+    x86_64|ppc|ia64|s390x)
         TOOLSARCH="$host_cpu"
         ;;
-    i486|i586|i686|i786|k6|k7)
+    i386|i486|i586|i686|i786|k6|k7)
         TOOLSARCH="i386"
         ;;
-    powerpc64)
+    ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
         TOOLSARCH="ppc"
         ;;
     *)
         AC_MSG_RESULT([not found])
-        AC_MSG_ERROR([invalid or unsupported CPU type])
+        AC_MSG_WARN([invalid or unsupported CPU type, things may break])
         ;;
     esac
 fi

Modified: trunk/extras/Makefile
===================================================================
--- trunk/extras/Makefile	2005-01-27 19:25:18 UTC (rev 607)
+++ trunk/extras/Makefile	2005-01-27 22:35:20 UTC (rev 608)
@@ -17,15 +17,6 @@
 
 OPTIMIZE = -O2
 
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
-
 DEFINES += -DOCFS2_FLAT_INCLUDES
 
 CFLAGS += $(OPTIMIZE)

Modified: trunk/toolsarch.guess
===================================================================
--- trunk/toolsarch.guess	2005-01-27 19:25:18 UTC (rev 607)
+++ trunk/toolsarch.guess	2005-01-27 22:35:20 UTC (rev 608)
@@ -16,10 +16,10 @@
 host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 
 case "$host_cpu" in
-  x86_64|i386|ppc|ia64|s390x)
+  x86_64|ppc|ia64|s390x)
     echo "$host_cpu"
     ;;
-  i486|i586|i686|i786|k6|k7)
+  i386|i486|i586|i686|i786|k6|k7)
     echo "i386"
     ;;
   ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)

Modified: trunk/tunefs.ocfs2/Makefile
===================================================================
--- trunk/tunefs.ocfs2/Makefile	2005-01-27 19:25:18 UTC (rev 607)
+++ trunk/tunefs.ocfs2/Makefile	2005-01-27 22:35:20 UTC (rev 608)
@@ -21,17 +21,8 @@
 INCLUDES = -I$(TOPDIR)/libocfs2/include $(GLIB_CFLAGS)
 DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
 
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
+#MANS = tunefs.ocfs2.8
 
-#MANS = fsck.ocfs2.8
-
 CFILES = tunefs.c
 OBJS = $(subst .c,.o,$(CFILES))