diff options
| author | jtb <jtb@pkgsrc.org> | 2003-05-10 14:21:32 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2003-05-10 14:21:32 +0000 |
| commit | 7af3c0f411fc168cc7e869bcb002c28553db4fe4 (patch) | |
| tree | 09ef3b900d04ae0ec8168936830fa06528724c93 /lang/oo2c | |
| parent | 7c5ca300f93cd1ab9467cd547cd4f5a3845ed79f (diff) | |
| download | pkgsrc-7af3c0f411fc168cc7e869bcb002c28553db4fe4.tar.gz | |
Fix detection of boehm-gc to work with the current pkgsrc version (where
we have <gc/gc.h> as opposed to <gc.h> in the older versions).
Diffstat (limited to 'lang/oo2c')
| -rw-r--r-- | lang/oo2c/distinfo | 8 | ||||
| -rw-r--r-- | lang/oo2c/patches/patch-aa | 4 | ||||
| -rw-r--r-- | lang/oo2c/patches/patch-ab | 13 | ||||
| -rw-r--r-- | lang/oo2c/patches/patch-ac | 11 |
4 files changed, 19 insertions, 17 deletions
diff --git a/lang/oo2c/distinfo b/lang/oo2c/distinfo index 7a3168be18f..cb6fcac8aba 100644 --- a/lang/oo2c/distinfo +++ b/lang/oo2c/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/05/02 23:32:45 jtb Exp $ +$NetBSD: distinfo,v 1.2 2003/05/10 14:21:32 jtb Exp $ SHA1 (oo2c_32-2.0.8.tar.bz2) = b72c6b61fd219c662d19fb8bf42288520775c99b Size (oo2c_32-2.0.8.tar.bz2) = 1428294 bytes -SHA1 (patch-aa) = 3dc42f59a65144725c279e9f9f61a4d9b56f23de -SHA1 (patch-ab) = 6f9b3eeac123aeba8ad14d53f240df5640f116a1 -SHA1 (patch-ac) = 17481a0eeda6be4ba65143ca011d233cb268d482 +SHA1 (patch-aa) = 0d2e00b36fe9bb022ff499b49408dc420f57b0d0 +SHA1 (patch-ab) = c53da4768af73eebfea2a747876054fa1d9fb733 +SHA1 (patch-ac) = e5b0872f5b9b97152d2f16f9805f7d9011362263 diff --git a/lang/oo2c/patches/patch-aa b/lang/oo2c/patches/patch-aa index 876530396d3..b395c1331a5 100644 --- a/lang/oo2c/patches/patch-aa +++ b/lang/oo2c/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/05/02 23:32:45 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2003/05/10 14:21:33 jtb Exp $ --- configure.orig +++ configure @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/02 23:32:45 jtb Exp $ -for ac_header in sys/time.h unistd.h io.h pwd.h utime.h stdint.h gc/gc.h -+for ac_header in sys/time.h unistd.h io.h pwd.h utime.h stdint.h gc.h ++for ac_header in sys/time.h unistd.h io.h pwd.h utime.h stdint.h gc/gc.h gc.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/lang/oo2c/patches/patch-ab b/lang/oo2c/patches/patch-ab index 480bb7703e5..34c5d7ab4f5 100644 --- a/lang/oo2c/patches/patch-ab +++ b/lang/oo2c/patches/patch-ab @@ -1,15 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/05/02 23:32:45 jtb Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/10 14:21:33 jtb Exp $ --- lib/src/__config.h.in.orig +++ lib/src/__config.h.in -@@ -9,8 +9,8 @@ - /* Define to 1 if you have the `ftruncate' function. */ - #undef HAVE_FTRUNCATE +@@ -12,6 +12,9 @@ + /* Define to 1 if you have the <gc/gc.h> header file. */ + #undef HAVE_GC_GC_H --/* Define to 1 if you have the <gc/gc.h> header file. */ --#undef HAVE_GC_GC_H +/* Define to 1 if you have the <gc.h> header file. */ +#undef HAVE_GC_H - ++ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY + diff --git a/lang/oo2c/patches/patch-ac b/lang/oo2c/patches/patch-ac index fbab652f25a..66003b16653 100644 --- a/lang/oo2c/patches/patch-ac +++ b/lang/oo2c/patches/patch-ac @@ -1,16 +1,19 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/05/02 23:32:45 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2003/05/10 14:21:33 jtb Exp $ --- lib/src/RT0.c.orig +++ lib/src/RT0.c -@@ -13,9 +13,9 @@ +@@ -13,9 +13,13 @@ #endif #define MAX_BACKTRACE_LEVELS 20 /* max number of backtraced procedure calls */ -#if defined(HAVE_LIBGC) && defined(HAVE_GC_GC_H) -+#if defined(HAVE_LIBGC) && defined(HAVE_GC_H) ++#if defined(HAVE_LIBGC) # define USE_BOEHM_GC --# include <gc/gc.h> ++#if defined(HAVE_GC_GC_H) + # include <gc/gc.h> ++#elif defined(HAVE_GC_H) +# include <gc.h> ++#endif #else # define GC_MALLOC malloc # define GC_MALLOC_ATOMIC malloc |