svn commit: trunk/uClibc/libc/misc/fnmatch

Jan-Benedict Glaw jbglaw at lug-owl.de
Mon Dec 26 22:03:06 UTC 2005


On Fri, 2005-12-23 16:08:40 -0800, psm at uclibc.org <psm at uclibc.org> wrote:
> Author: psm
> Date: 2005-12-23 16:08:38 -0800 (Fri, 23 Dec 2005)
> New Revision: 12975
[...]
> Modified:
>    trunk/uClibc/libc/misc/fnmatch/Makefile.in
> Changeset:
> Modified: trunk/uClibc/libc/misc/fnmatch/Makefile.in
> ===================================================================
> --- trunk/uClibc/libc/misc/fnmatch/Makefile.in	2005-12-23 20:35:12 UTC (rev 12974)
> +++ trunk/uClibc/libc/misc/fnmatch/Makefile.in	2005-12-24 00:08:38 UTC (rev 12975)
> @@ -6,11 +6,13 @@
>  # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
>  #
>  
> +CSRC:=fnmatch_old.c
> +
>  MISC_FNMATCH_DIR:=$(top_srcdir)libc/misc/fnmatch
>  MISC_FNMATCH_OUT:=$(top_builddir)libc/misc/fnmatch
>  
> -MISC_FNMATCH_SRC:=$(MISC_FNMATCH_DIR)/fnmatch.c
> -MISC_FNMATCH_OBJ:=$(MISC_FNMATCH_OUT)/fnmatch.o
> +MISC_FNMATCH_SRC:=$(patsubst %.c,$(MISC_FNMATCH_DIR)/%.c,$(CSRC))
> +MISC_FNMATCH_OBJ:=$(patsubst %.c,$(MISC_FNMATCH_OUT)/%.c,$(CSRC))
>  
>  libc-a-y+=$(MISC_FNMATCH_OBJ)
>  libc-so-y+=$(MISC_FNMATCH_OBJ:.o=.os)

This patch is wrong and breaks (at least) building a static libc. The
$(MISC_FNMATCH_OBJ) file still uses the .c extension, thus isn't built
at all and eg. strip'ping the .c file fails, breaking the build.

This patch fixes it:

Index: libc/misc/fnmatch/Makefile.in
===================================================================
--- libc/misc/fnmatch/Makefile.in	(revision 12978)
+++ libc/misc/fnmatch/Makefile.in	(working copy)
@@ -16,7 +16,7 @@
 MISC_FNMATCH_OUT:=$(top_builddir)libc/misc/fnmatch
 
 MISC_FNMATCH_SRC:=$(patsubst %.c,$(MISC_FNMATCH_DIR)/%.c,$(CSRC))
-MISC_FNMATCH_OBJ:=$(patsubst %.c,$(MISC_FNMATCH_OUT)/%.c,$(CSRC))
+MISC_FNMATCH_OBJ:=$(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC))
 
 libc-a-$(UCLIBC_HAS_FNMATCH)+=$(MISC_FNMATCH_OBJ)
 libc-so-$(UCLIBC_HAS_FNMATCH)+=$(MISC_FNMATCH_OBJ:.o=.os)


MfG, JBG

-- 
Jan-Benedict Glaw       jbglaw at lug-owl.de    . +49-172-7608481             _ O _
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Zensur | Gegen Krieg  _ _ O
 für einen Freien Staat voll Freier Bürger"  | im Internet! |   im Irak!   O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.busybox.net/pipermail/uclibc/attachments/20051226/8c76c6df/attachment-0002.pgp 


More information about the uClibc mailing list