diff options
| author | joerg <joerg@pkgsrc.org> | 2011-12-02 13:59:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-12-02 13:59:35 +0000 |
| commit | 8bf41f9df473f601b3cc83c27762c918de999235 (patch) | |
| tree | d583acbbb4d4cafb9547dbfd5ce0401bfe3d67ce /lang/guile16 | |
| parent | a2b3fde57c2eec8c37d8d6cf05be9a237e756d2d (diff) | |
| download | pkgsrc-8bf41f9df473f601b3cc83c27762c918de999235.tar.gz | |
Backport a patch to fix build with GCC 4.4 and extend it to cover GCC
4.5 as well. Permission to use under GPL2 from Andy Wingo.
Diffstat (limited to 'lang/guile16')
| -rw-r--r-- | lang/guile16/distinfo | 3 | ||||
| -rw-r--r-- | lang/guile16/patches/patch-scripts-snarf-check-and-output-texi | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/lang/guile16/distinfo b/lang/guile16/distinfo index 3e22c6d34fb..65f6569c439 100644 --- a/lang/guile16/distinfo +++ b/lang/guile16/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2009/12/15 16:34:53 joerg Exp $ +$NetBSD: distinfo,v 1.3 2011/12/02 13:59:35 joerg Exp $ SHA1 (guile-1.6.8.tar.gz) = 5c244f730d7aaee32db4b0cc77b688f74a5caa71 RMD160 (guile-1.6.8.tar.gz) = 9c2c6a6afe2adce458e30e97da782ae18ce75b5c @@ -12,3 +12,4 @@ SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a SHA1 (patch-ai) = 73e4a95dc9e9ede4d423e3a73fc2b0ac4f4802e0 SHA1 (patch-aj) = 2d55986fd8161bdc32c6e2ef7fe3d89310ab20cd SHA1 (patch-ak) = 8cb47bf5d2c3818f860c459180507d4b2eae0b60 +SHA1 (patch-scripts-snarf-check-and-output-texi) = 49ea1065f77925ff9417eb49bd8790d2c4f16202 diff --git a/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi b/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi new file mode 100644 index 00000000000..61775901e08 --- /dev/null +++ b/lang/guile16/patches/patch-scripts-snarf-check-and-output-texi @@ -0,0 +1,33 @@ +$NetBSD: patch-scripts-snarf-check-and-output-texi,v 1.1 2011/12/02 13:59:35 joerg Exp $ + +Extended backport of 445f31fc06d338f0cafda188d0287f935c2edc3c to fix +build with GCC 4.4 and higher. + +--- scripts/snarf-check-and-output-texi.orig 2011-11-28 12:39:23.000000000 +0000 ++++ scripts/snarf-check-and-output-texi +@@ -266,6 +266,25 @@ exec ${GUILE-guile} -l $0 -c "(apply $ma + (set! *file* file) + (set! *line* line)) + ++ ;; newer gccs like to throw around more location markers into the ++ ;; preprocessed source; these (hash . hash) bits are what they translate to ++ ;; in snarfy terms. ++ (('location ('string . file) ('int . line) ('hash . 'hash)) ++ (set! *file* file) ++ (set! *line* line)) ++ ++ (('location ('string . file) ('int . line) ('hash . 'hash) ('int . line2) ('string . file2)) ++ (set! *file* file) ++ (set! *line* line)) ++ ++ (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash)) ++ (set! *file* file) ++ (set! *line* line)) ++ ++ (('location ('hash . 'hash) ('int . line) ('string . file) ('string . file2) ('int . line2) ('hash . 'hash) ('int . line3) ('string . file3)) ++ (set! *file* file) ++ (set! *line* line)) ++ + (('arglist rest ...) + (set! *args* (do-arglist rest))) + |