diff options
| author | tron <tron@pkgsrc.org> | 1999-11-21 13:14:21 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-11-21 13:14:21 +0000 |
| commit | 04eb54bee255b1828bceeb52c59909f0a0a0afbe (patch) | |
| tree | 1435e6ef0c7c1dc956fe2b8bc1d9b4c10587d6bd /x11/xscreensaver | |
| parent | 9768e5ae2da3403273401dfacf475f521e60ad9a (diff) | |
| download | pkgsrc-04eb54bee255b1828bceeb52c59909f0a0a0afbe.tar.gz | |
Compile "distort.c" without optimization on arm32 to avoid compiler bug
reported in PR bin/7460.
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/files/patch-sum | 2 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ab | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum index 2ae28fe6f14..ee3df411c3c 100644 --- a/x11/xscreensaver/files/patch-sum +++ b/x11/xscreensaver/files/patch-sum @@ -1,6 +1,6 @@ <<<<<<< patch-sum MD5 (patch-aa) = 613fc83aaf712d88e2116bb1f78ddbe4 -MD5 (patch-ab) = 79399e7528261b89029bede4eaf1d2bf +MD5 (patch-ab) = 457c85e399ba0aa02266e9d3bc77336c MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95 MD5 (patch-ad) = 14a6de743f1b7b8f35fb4f30cc1c7ab4 diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab index 96f975f6418..59c7843fa20 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 1999/07/02 15:23:13 frueauf Exp $ +$NetBSD: patch-ab,v 1.3 1999/11/21 13:14:21 tron Exp $ ---- hacks/Makefile.in.orig Thu Jun 24 01:00:24 1999 -+++ hacks/Makefile.in Wed Jun 30 18:33:52 1999 +--- hacks/Makefile.in.orig Fri Nov 12 11:46:28 1999 ++++ hacks/Makefile.in Sun Nov 21 12:47:32 1999 @@ -42,7 +42,7 @@ # Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc. # @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 1999/07/02 15:23:13 frueauf Exp $ HACK_LIBS = $(HACK_PRE) @HACK_LIBS@ $(HACK_POST) XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST) XLOCK_LIBS = $(HACK_LIBS) -@@ -181,8 +181,8 @@ +@@ -185,8 +185,8 @@ else \ p=$(srcdir)/$$program ; \ fi ; \ @@ -22,3 +22,15 @@ $NetBSD: patch-ab,v 1.2 1999/07/02 15:23:13 frueauf Exp $ done munge-scripts: $(SCRIPTS) +@@ -489,6 +489,11 @@ + + bsod: bsod.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) $(XPM_LIBS) ++ ++.if ($(MACHINE_ARCH) == arm32) ++distort.o: distort.c ++ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS:S/-O2//) $(X_CFLAGS) $< ++.endif + + distort: distort.o $(HACK_OBJS) $(GRAB) $(SHM) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS) $(GRAB_LIBS) |