[Ocfs2-tools-commits] jlbec commits r1186 - in trunk: . o2cb_ctl vendor/common

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-04-28 17:35:53 -0500 (Fri, 28 Apr 2006)
New Revision: 1186

Modified:
   trunk/o2cb_ctl/o2cb_ctl.c
   trunk/rpmarch.guess
   trunk/vendor/common/ocfs2-tools.spec.in
Log:

o Fix build on ppc.
  - Force "--target ppc" so that rpmbuild(8) does the right thing.
  - Force _libdir of /usr/lib because Red Hat rpmbuild(8) makes it
    /usr/lib64 even on a 32bit build.



Modified: trunk/o2cb_ctl/o2cb_ctl.c
===================================================================
--- trunk/o2cb_ctl/o2cb_ctl.c	2006-04-28 22:33:17 UTC (rev 1185)
+++ trunk/o2cb_ctl/o2cb_ctl.c	2006-04-28 22:35:53 UTC (rev 1186)
@@ -1377,9 +1377,9 @@
 
     ret = o2cb_init();
     if (ret) {
-	com_err(PROGNAME, ret, "Cannot initialize cluster\n");
-	rc = -EINVAL;
-	goto out_error;
+	    com_err(PROGNAME, ret, "Cannot initialize cluster\n");
+	    rc = -EINVAL;
+	    goto out_error;
     }
 
     switch (ctxt.oc_op)

Modified: trunk/rpmarch.guess
===================================================================
--- trunk/rpmarch.guess	2006-04-28 22:33:17 UTC (rev 1185)
+++ trunk/rpmarch.guess	2006-04-28 22:35:53 UTC (rev 1186)
@@ -25,13 +25,13 @@
 fi
 
 case "$host_cpu" in
-  x86_64|ppc|ia64|s390x)
+  x86_64|ia64|s390x)
     TOOLSARCH=""
     ;;
   i386|i486|i586|i686|i786|k6|k7)
     TOOLSARCH="i386"
     ;;
-  ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+  ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
     TOOLSARCH="ppc"
     ;;
   *)

Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in	2006-04-28 22:33:17 UTC (rev 1185)
+++ trunk/vendor/common/ocfs2-tools.spec.in	2006-04-28 22:35:53 UTC (rev 1186)
@@ -7,6 +7,12 @@
 %define _prefix /usr
 # Because RPM is dumb
 %define _unpackaged_files_terminate_build 0
+# Because RH defines lib64 on ppc32 builds
+%ifarch ppc
+%define brokenrhlibdir /usr/lib
+%else
+%define brokenrhlibdir %{_libdir}
+%endif
 
 Summary: Tools for managing the Oracle Cluster Filesystem 2
 Name: ocfs2-tools
@@ -80,7 +86,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 %if %{compile_py}
-%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{_libdir}/python%{pyversion}/site-packages/ocfs2interface', ddir='%{_libdir}/python%{pyversion}/site-packages/ocfs2interface')"
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{brokenrhlibdir}/python%{pyversion}/site-packages/ocfs2interface', ddir='%{brokenrhlibdir}/python%{pyversion}/site-packages/ocfs2interface')"
 %endif
 
 
@@ -126,7 +132,7 @@
 
 %files -n ocfs2console
 %defattr(-,root,root)
-%{_libdir}/python%{pyversion}/site-packages/ocfs2interface
+%{brokenrhlibdir}/python%{pyversion}/site-packages/ocfs2interface
 /usr/sbin/ocfs2console
 /usr/share/man/man8/ocfs2console.8.gz