Wed, 01 Aug 2012 23:42:52 +0200
Correct nonportable usage of GCC builtin_* macros in RPM source.
openpkg/openpkg.spec | file | annotate | diff | comparison | revisions | |
openpkg/rpm.patch | file | annotate | diff | comparison | revisions |
1.1 --- a/openpkg/openpkg.spec Wed Aug 01 23:37:13 2012 +0200 1.2 +++ b/openpkg/openpkg.spec Wed Aug 01 23:42:52 2012 +0200 1.3 @@ -1193,6 +1193,14 @@ 1.4 ( br=`pwd` 1.5 cd rpm-%{V_rpm_major}.%{V_rpm_minor} 1.6 1.7 + # provide nonstandard constructs 1.8 + cat > nonstandard.h <<EOF 1.9 +/* MSvB: define missing nonstandard GCC builtin extensions */ 1.10 +#ifndef __GNUC__ 1.11 +#define __builtin_expect(e,n) (e) 1.12 +#endif /* ifndef __GNUC__ */ 1.13 +EOF 1.14 + 1.15 # cheat GNU Autoconf 1.16 ( echo 'ac_cv_path_MSGFMT=:' 1.17 echo 'ac_cv_path_GMSGFMT=:'
2.1 --- a/openpkg/rpm.patch Wed Aug 01 23:37:13 2012 +0200 2.2 +++ b/openpkg/rpm.patch Wed Aug 01 23:42:52 2012 +0200 2.3 @@ -172,6 +172,19 @@ 2.4 } 2.5 d64buf; 2.6 2.7 +Index: rpmio/fnmatch.c 2.8 +--- rpmio/fnmatch.c 2012-08-01 21:24:05.278487112 +0200 2.9 ++++ rpmio/fnmatch.c.orig 2008-10-12 12:38:58.000000000 +0200 2.10 +@@ -24,6 +24,9 @@ 2.11 + 2.12 + #include "system.h" 2.13 + 2.14 ++/* Provide nonstandard constructs */ 2.15 ++#include "nonstandard.h" 2.16 ++ 2.17 + #include <string.h> 2.18 + 2.19 + #include "debug.h" 2.20 Index: lua/local/lposix.c 2.21 --- lua/local/lposix.c.orig 2009-03-06 23:52:45 +0100 2.22 +++ lua/local/lposix.c 2009-09-20 19:57:28 +0200