Changeset 343d0da1 in mainline

Timestamp:

2011-06-26T01:33:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10fdd0e

Parents:

c3b653a

Message:

Libiberty fnmatch prevented from shadowing libposix fnmatch.

File:

• uspace/app/binutils/intrusive.sh (modified) (4 diffs)

uspace/app/binutils/intrusive.sh

@@ -85 +85 @@
 # from libposix are prefixed with the posix_ prefix.
 #
+# Patch 7
+# Implementation of fnmatch inside libiberty is not very friendly to the
+# non-GNU libc which implements its own native fnmatch. To resolve this 
+# incompatibility, libiberty fnmatch has to be manually hidden.
+#
 
 case "$1" in
@@ -95 +100 @@
                 cp -f "$2/ld/configure" "$2/ld/configure.backup"
                 cp -f "$2/libiberty/configure" "$2/libiberty/configure.backup"
+                cp -f "$2/libiberty/Makefile.in" "$2/libiberty/Makefile.in.backup"
+                cp -f "$2/include/fnmatch.h" "$2/include/fnmatch.h.backup"
+                cp -f "$2/libiberty/fnmatch.c" "$2/libiberty/fnmatch.c.backup"
                 cp -f "$2/libiberty/pex-common.h" "$2/libiberty/pex-common.h.backup"
                 cp -f "$2/libiberty/xstrerror.c" "$2/libiberty/xstrerror.c.backup"
@@ -139 +147 @@
                 sed 's/^cross_compiling=no/cross_compiling=yes/g' \
                 > "$2/libiberty/configure"
+
+                # Hide libiberty fnmatch implementation.
+                # See Patch 7.
+                mv -f "$2/include/fnmatch.h" "$2/include/fnmatch_hide.h"
+                (
+                # Avoid compiler warning for empty compilation unit.
+                echo 'char __fnmatch_hide(void);'
+                echo 'char __fnmatch_hide(void) { return 0; }'
+                echo '#define __GNU_LIBRARY__'
+                cat "$2/libiberty/fnmatch.c.backup"
+                ) > "$2/libiberty/fnmatch.c"
+                mv -f "$2/libiberty/fnmatch.c" "$2/libiberty/fnmatch_hide.c"
+                cat "$2/libiberty/Makefile.in.backup" | \
+                sed 's/fnmatch/fnmatch_hide/g' \
+                > "$2/libiberty/Makefile.in"
 
                 # Patch libiberty pex-common.h.
@@ -170 +193 @@
                 mv -f "$2/ld/configure.backup" "$2/ld/configure"
                 mv -f "$2/libiberty/configure.backup" "$2/libiberty/configure"
+                mv -f "$2/libiberty/Makefile.in.backup" "$2/libiberty/Makefile.in"
+                rm -f "$2/include/fnmatch_hide.h" "$2/libiberty/fnmatch_hide.c"
+                mv -f "$2/include/fnmatch.h.backup" "$2/include/fnmatch.h"
+                mv -f "$2/libiberty/fnmatch.c.backup" "$2/libiberty/fnmatch.c"
                 mv -f "$2/libiberty/pex-common.h.backup" "$2/libiberty/pex-common.h"
                 mv -f "$2/libiberty/xstrerror.c.backup" "$2/libiberty/xstrerror.c"