diff options
| author | wiz <wiz@pkgsrc.org> | 2013-11-15 14:10:29 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-11-15 14:10:29 +0000 |
| commit | cd02b521df50401874e77d3281e0a6100e6193ea (patch) | |
| tree | 319f20e268c96142ad25aace8c2a9a0be0377256 /devel/frama-c | |
| parent | 85b5641e1f6ebd43c8588feeeda24727eb19fde0 (diff) | |
| download | pkgsrc-cd02b521df50401874e77d3281e0a6100e6193ea.tar.gz | |
Fix GNU make version comparison logic.
Diffstat (limited to 'devel/frama-c')
| -rw-r--r-- | devel/frama-c/distinfo | 5 | ||||
| -rw-r--r-- | devel/frama-c/patches/patch-configure | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/devel/frama-c/distinfo b/devel/frama-c/distinfo index 43384e9e51a..ec3091c2e42 100644 --- a/devel/frama-c/distinfo +++ b/devel/frama-c/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/10/08 15:28:04 jaapb Exp $ +$NetBSD: distinfo,v 1.5 2013/11/15 14:10:29 wiz Exp $ SHA1 (frama-c-Oxygen-20120901.tar.gz) = 65aef0a88b788d11a6b5061dc08741492859de40 RMD160 (frama-c-Oxygen-20120901.tar.gz) = 76daf11770a52b1b1bc59ca9c576208ac08755a8 Size (frama-c-Oxygen-20120901.tar.gz) = 10815011 bytes -SHA1 (patch-Makefile) = f851797e599f682c4067fb02543b66c38cbd3446 -SHA1 (patch-src_wp_Makefile) = bce0f55bae0718df462b2e1b6da689a4a00113d1 +SHA1 (patch-configure) = c7e895c967199433c9d55d99347ec14cad9b41ab diff --git a/devel/frama-c/patches/patch-configure b/devel/frama-c/patches/patch-configure new file mode 100644 index 00000000000..9e69dd25e61 --- /dev/null +++ b/devel/frama-c/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2013/11/15 14:10:29 wiz Exp $ + +Fix GNU make version comparison logic. + +--- configure.orig 2013-11-15 14:08:17.000000000 +0000 ++++ configure +@@ -2617,7 +2617,7 @@ MAKE_DISTRIB=`$MAKE -v | sed -n -e 's/\( + MAKE_MAJOR=`$MAKE -v | sed -n -f bin/sed_get_make_major ` + MAKE_MINOR=`$MAKE -v | sed -n -f bin/sed_get_make_minor ` + echo $ECHO_N "make version is $MAKE_DISTRIB Make $MAKE_MAJOR.$MAKE_MINOR: $ECHO_C" +-if test "$MAKE_DISTRIB" != GNU -o "$MAKE_MAJOR" -lt 3 -o "$MAKE_MINOR" -lt 81; ++if test "$MAKE_DISTRIB" != GNU -o "$MAKE_MAJOR" -lt 3 -o "$MAKE_MAJOR" -eq 3 -a "$MAKE_MINOR" -lt 81; + then + echo "${ECHO_T}" + as_fn_error $? "unsupported version; GNU Make version 3.81 |