# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1343857372 -7200
# Node ID 24700f8ed0577f578a59a7ce3231d38414529995
# Parent  66c3db5d26f6bd9b52d58d0cdc6e8eb8163dc66f
Correct nonportable usage of GCC builtin_* macros in RPM source.

diff -r 66c3db5d26f6 -r 24700f8ed057 openpkg/openpkg.spec
--- a/openpkg/openpkg.spec	Wed Aug 01 23:37:13 2012 +0200
+++ b/openpkg/openpkg.spec	Wed Aug 01 23:42:52 2012 +0200
@@ -1193,6 +1193,14 @@
     ( br=`pwd`
       cd rpm-%{V_rpm_major}.%{V_rpm_minor}
 
+      #   provide nonstandard constructs
+      cat > nonstandard.h <<EOF
+/* MSvB: define missing nonstandard GCC builtin extensions */
+#ifndef __GNUC__
+#define __builtin_expect(e,n) (e)
+#endif /* ifndef __GNUC__ */
+EOF
+
       #   cheat GNU Autoconf
       ( echo 'ac_cv_path_MSGFMT=:'
         echo 'ac_cv_path_GMSGFMT=:'
diff -r 66c3db5d26f6 -r 24700f8ed057 openpkg/rpm.patch
--- a/openpkg/rpm.patch	Wed Aug 01 23:37:13 2012 +0200
+++ b/openpkg/rpm.patch	Wed Aug 01 23:42:52 2012 +0200
@@ -172,6 +172,19 @@
      		    }
      		  d64buf;
  
+Index: rpmio/fnmatch.c
+--- rpmio/fnmatch.c	2012-08-01 21:24:05.278487112 +0200
++++ rpmio/fnmatch.c.orig	2008-10-12 12:38:58.000000000 +0200
+@@ -24,6 +24,9 @@
+ 
+ #include "system.h"
+ 
++/* Provide nonstandard constructs */
++#include "nonstandard.h"
++
+ #include <string.h>
+ 
+ #include "debug.h"
 Index: lua/local/lposix.c
 --- lua/local/lposix.c.orig	2009-03-06 23:52:45 +0100
 +++ lua/local/lposix.c	2009-09-20 19:57:28 +0200