fix RPM building on Unixware by using Linux i386 assembly specific stuff on Linux only.

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2003
 ====
 
+20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific stuff on Linux only.
 20031020 include "trigger argument passing patch" from RPM BugDB 
 20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
 20031020 finish porting to SCO UnixWare 7.1.3

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20031020
+%define       V_openpkg  20031021
 
 #   the used software versions
 %define       V_rpm      4.2.1

openpkg/rpm.patch.bugfix

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 20-Oct-2003
+##  Created on: 21-Oct-2003
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

openpkg/rpm.patch.feature

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 20-Oct-2003
+##  Created on: 21-Oct-2003
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

openpkg/rpm.patch.porting

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 20-Oct-2003
+##  Created on: 21-Oct-2003
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -1051,3 +1051,19 @@ Index: aclocal.m4
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+
++---------------------------------------------------------------------------
+| Use Linux i386 assembly specific stuff on Linux only.
++---------------------------------------------------------------------------
+Index: rpmio/rpmsw.c
+--- rpmio/rpmsw.c	5 Jun 2003 12:04:05 -0000	1.1.1.1
++++ rpmio/rpmsw.c	21 Oct 2003 14:45:54 -0000
+@@ -27,7 +27,7 @@
+ /*@unchecked@*/
+ static int rpmsw_initialized = 0;
+ 
+-#if defined(__i386__)
++#if defined(__linux__) && defined(__i386__)
+ /* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */
+ 
+ #define	HP_TIMING_ZERO(Var)	(Var) = (0)

openpkg/rpm.patch.regen

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 20-Oct-2003
+##  Created on: 21-Oct-2003
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.