diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-05 21:35:06 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-05 21:35:06 +0000 |
| commit | 9e81ba85607ea9524e0bee914032b182faa07b67 (patch) | |
| tree | d50e84fe3ca862fc9f96accb58cf83358b464946 /devel | |
| parent | 1b836a1ecba6bd1315092abcb04d34050481835b (diff) | |
| download | pkgsrc-9e81ba85607ea9524e0bee914032b182faa07b67.tar.gz | |
on alpha, compile gdk-glue.c without optimization to work around a
compiler bug.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/guile-gtk/Makefile | 3 | ||||
| -rw-r--r-- | devel/guile-gtk/distinfo | 4 | ||||
| -rw-r--r-- | devel/guile-gtk/patches/patch-aa | 29 |
3 files changed, 29 insertions, 7 deletions
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile index a77253735bf..8548418a9fc 100644 --- a/devel/guile-gtk/Makefile +++ b/devel/guile-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/01/25 12:34:41 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2003/02/05 21:35:06 dmcmahill Exp $ # DISTNAME= guile-gtk-0.19 @@ -21,6 +21,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --datadir=${GUILE14_PREFIX}/share PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} pre-build: cd ${WRKSRC}; for file in build-guile-gtk; do \ diff --git a/devel/guile-gtk/distinfo b/devel/guile-gtk/distinfo index cc341957bcf..cdf7bf9f409 100644 --- a/devel/guile-gtk/distinfo +++ b/devel/guile-gtk/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/12/13 15:17:44 jschauma Exp $ +$NetBSD: distinfo,v 1.4 2003/02/05 21:35:06 dmcmahill Exp $ SHA1 (guile-gtk-0.19.tar.gz) = 22e445fb0574cee76c0d18dbdc28090b63b88302 Size (guile-gtk-0.19.tar.gz) = 278896 bytes -SHA1 (patch-aa) = 5d1af25c0be572fb958e963828242e547d816e65 +SHA1 (patch-aa) = 54753539855280704593b9ee7da330ec6934bfdf diff --git a/devel/guile-gtk/patches/patch-aa b/devel/guile-gtk/patches/patch-aa index e99e6cb9bb3..d5dd20e0039 100644 --- a/devel/guile-gtk/patches/patch-aa +++ b/devel/guile-gtk/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2002/12/13 15:17:45 jschauma Exp $ +$NetBSD: patch-aa,v 1.6 2003/02/05 21:35:07 dmcmahill Exp $ ---- Makefile.in.orig Fri Dec 13 10:08:53 2002 -+++ Makefile.in Fri Dec 13 10:11:29 2002 -@@ -617,7 +617,7 @@ +--- Makefile.in.orig Wed Jul 26 19:24:58 2000 ++++ Makefile.in +@@ -617,7 +617,7 @@ install-data-local: $(INSTALL_DATA) ./gtk/config.scm $(gtkmoduledir)/config.scm $(INSTALL_DATA) $(srcdir)/gtk/event-repl.scm $(gtkmoduledir)/event-repl.scm .c.x: @@ -11,3 +11,24 @@ $NetBSD: patch-aa,v 1.5 2002/12/13 15:17:45 jschauma Exp $ gtk-glue.c: $(gtkdefs) $(gdkdefs) build-guile-gtk $(BUILD) -I $(srcdir) glue $(gtkdefs) >tmpt && mv tmpt $@ +@@ -641,3 +641,20 @@ dist-hook: + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++# problems with optimization. triggers internal compiler errors ++ ++COMPILE_NOOPT=${COMPILE:C/-O[0-9]*//g} ++LTCOMPILE_NOOPT=${LTCOMPILE:C/-O[0-9]*//g} ++ ++.if (${MACHINE_ARCH} == "alpha") ++ ++gdk-glue.o: gdk-glue.c ++ $(COMPILE_NOOPT) -c gdk-glue.c ++ ++gdk-glue.lo: gdk-glue.c ++ @echo "Compiling without optimization to work around gcc -O* compiler bug" ++ $(LTCOMPILE_NOOPT) -c gdk-glue.c ++ ++.endif ++ |