diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/moc/patches | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/moc/patches')
| -rw-r--r-- | package/moc/patches/patch-configure | 20 | ||||
| -rw-r--r-- | package/moc/patches/patch-options_c | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure new file mode 100644 index 000000000..2330e0f4c --- /dev/null +++ b/package/moc/patches/patch-configure @@ -0,0 +1,20 @@ +--- moc-2.5.0-alpha4.orig/configure 2009-09-25 10:54:41.000000000 +0200 ++++ moc-2.5.0-alpha4/configure 2010-03-06 11:37:45.867276809 +0100 +@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins + PLUGIN_LDFLAGS='-module -avoid-version' + + +-OS=`uname 2>/dev/null` ++OS=Linux + + case "$OS" in + Linux) +@@ -17688,7 +17688,7 @@ _ACEOF + ;; + esac + +-LDFLAGS="$LDFLAGS -export-dynamic" ++LDFLAGS="$LDFLAGS" + + { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c new file mode 100644 index 000000000..b5e9ca676 --- /dev/null +++ b/package/moc/patches/patch-options_c @@ -0,0 +1,11 @@ +--- moc-2.5.0-alpha4.orig/options.c 2009-09-16 12:04:53.000000000 +0200 ++++ moc-2.5.0-alpha4/options.c 2010-03-06 11:38:50.596035001 +0100 +@@ -327,7 +327,7 @@ static void option_add_symb (const char + char *val = va_arg (va, char *); + if (strlen (val) == 0 || + strlen (val) != strspn (val, valid) || +- index (first, val[0]) != NULL) ++ strchr (first, val[0]) != NULL) + fatal ("Invalid symbol in '%s' constraint list.", name); + ((char **) options[pos].constraints)[ix] = xstrdup (val); + if (!strcasecmp (val, value)) |