[pkgsrc/trunk]: pkgsrc/devel/nasm Ah well, GCC_VERSION is only defined within...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b889327071ca
branches:  trunk
changeset: 523475:b889327071ca
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Jan 08 13:36:28 2007 +0000

description:
Ah well, GCC_VERSION is only defined within gcc code.  Use __GNUC__ and
__GNUC_MINOR__ instead.  Still checking for >= 3.4.0 though.

diffstat:

 devel/nasm/distinfo         |  4 ++--
 devel/nasm/patches/patch-ad |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r a7c0c9ed2b2e -r b889327071ca devel/nasm/distinfo
--- a/devel/nasm/distinfo       Mon Jan 08 13:34:12 2007 +0000
+++ b/devel/nasm/distinfo       Mon Jan 08 13:36:28 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/01/08 13:21:43 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2007/01/08 13:36:28 jmmv Exp $
 
 SHA1 (nasm-0.98.39.tar.bz2) = 73d64812bb95774355f737c0fb0271382d23db67
 RMD160 (nasm-0.98.39.tar.bz2) = b5587b1b81f58cef3a50e438e8efb365945df587
@@ -6,5 +6,5 @@
 SHA1 (patch-aa) = 27409c3b71634dc5c3aa02b3cae49ebad2db6579
 SHA1 (patch-ab) = bbe1d7219dd2e5ade8f97a4f3070bc87d3a7d4b5
 SHA1 (patch-ac) = 7ae622ab78b1cf30ca027d652476d7d48deae182
-SHA1 (patch-ad) = 63e36d38c04006ff1730171714ea3e84fa640af9
+SHA1 (patch-ad) = eb96df3bc7e3f42446291d7a6550b3978fe7e063
 SHA1 (patch-ae) = f6029c8574c4e11d59d161819a379e9f687bc346
diff -r a7c0c9ed2b2e -r b889327071ca devel/nasm/patches/patch-ad
--- a/devel/nasm/patches/patch-ad       Mon Jan 08 13:34:12 2007 +0000
+++ b/devel/nasm/patches/patch-ad       Mon Jan 08 13:36:28 2007 +0000
@@ -207,7 +207,7 @@
 +    if (align != (align & -align)) {
 +      return -1;
 +    } else {
-+#if defined(__GNUC__) && GCC_VERSION >= 3004
++#if __GNUC__ > 3 || (__GNUC__ == 3 && __GCC_MINOR__ >= 4)
 +      return (align ? __builtin_ctzl (align) : 0);
 +#else
 +      unsigned long result = 0;