diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | rts/Linker.c | 8 | ||||
| -rwxr-xr-x | sync-all | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 0e72d22afb..ed3d006cbf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1116,7 +1116,7 @@ if test "$RELEASE" = "NO"; then AC_MSG_RESULT(given $PACKAGE_VERSION) elif test -d .git; then changequote(, )dnl - ver_date=`git log -n 1 --date=short --pretty=format:%ci | sed "s/^.*\([0-9][0-9][0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9]\).*$/\1\2\3/"` + ver_date=`git log -n 1 --date=short --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -` if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else changequote([, ])dnl AC_MSG_ERROR([failed to detect version date: check that git is in your path]) diff --git a/rts/Linker.c b/rts/Linker.c index c840857490..c1310b03b0 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1186,11 +1186,11 @@ initLinker( void ) # endif /* RTLD_DEFAULT */ compileResult = regcomp(&re_invalid, - "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*invalid ELF header", + "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)", REG_EXTENDED); ASSERT( compileResult == 0 ); compileResult = regcomp(&re_realso, - "GROUP *\\( *(([^ )])+)", + "(GROUP|INPUT) *\\( *(([^ )])+)", REG_EXTENDED); ASSERT( compileResult == 0 ); # endif @@ -1361,8 +1361,8 @@ addDLL( char *dll_name ) if (regexec(&re_realso, line, (size_t) NMATCH, match, 0) == 0) { // success -- try to dlopen the first named file IF_DEBUG(linker, debugBelch("match%s\n","")); - line[match[1].rm_eo] = '\0'; - errmsg = internal_dlopen(line+match[1].rm_so); + line[match[2].rm_eo] = '\0'; + errmsg = internal_dlopen(line+match[2].rm_so); break; } // if control reaches here, no GROUP ( ... ) directive was found @@ -389,6 +389,10 @@ sub scmall { scm ($localpath, $scm, "grep", @args) unless $scm eq "darcs"; } + elsif ($command =~ /^clean$/) { + scm ($localpath, $scm, "clean", @args) + unless $scm eq "darcs"; + } elsif ($command =~ /^reset$/) { scm ($localpath, $scm, "reset", @args) unless $scm eq "darcs"; @@ -426,6 +430,7 @@ Supported commands: * remote rm <branch-name> * remote set-url [--push] <branch-name> * grep + * clean * reset * config |