Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1174872
b: refs/heads/trunk
c: 649a997
h: refs/heads/trunk
  • Loading branch information
wiz committed Nov 15, 2013
1 parent 4de465e commit dbe4181
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
refs/heads/trunk: fc1bd66a47dd0d6e32e7a652fd1d246bfd28f633
refs/heads/trunk: 649a99754d5403bf71c13d6d42c4748853d77cc3
"refs/heads/pkgsrc_2014Q1": 2ccf469299676d5bee871f365c7fb7a8cb9195a3
refs/heads/gh-pages: e7865e1a0b95efc19be446a9d3c4c4974373f4f7
refs/heads/joyent/bulktest/trunk: 64c317f225ebd9709ac0ea3462c7f787b403ad72
Expand Down
5 changes: 2 additions & 3 deletions trunk/devel/frama-c/distinfo
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions trunk/devel/frama-c/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit dbe4181

Please sign in to comment.