svn commit: trunk/uClibc/test: regex
psm at uclibc.org
psm at uclibc.org
Thu Mar 2 16:41:05 UTC 2006
Author: psm
Date: 2006-03-02 08:41:04 -0800 (Thu, 02 Mar 2006)
New Revision: 14428
Log:
Remove CFLAGS-OMIT support, rename getline to get testregex compile w/ -D_GNU_SOURCE
Modified:
trunk/uClibc/test/Test.mak
trunk/uClibc/test/regex/Makefile
trunk/uClibc/test/regex/testregex.c
Changeset:
Modified: trunk/uClibc/test/Test.mak
===================================================================
--- trunk/uClibc/test/Test.mak 2006-03-02 16:37:41 UTC (rev 14427)
+++ trunk/uClibc/test/Test.mak 2006-03-02 16:41:04 UTC (rev 14428)
@@ -73,7 +73,7 @@
$(U_TARGETS):
$(showlink)
- $(Q)$(CC) $(filter-out $(CFLAGS-OMIT_$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o
+ $(Q)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o
$(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@)
ifeq ($(COMPILE_ONLY),)
$(exec_test)
@@ -82,7 +82,7 @@
$(G_TARGETS):
$(showlink)
- $(Q)$(HOSTCC) $(filter-out $(CFLAGS-OMIT_$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
+ $(Q)$(HOSTCC) $(HOST_CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
$(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
ifeq ($(COMPILE_ONLY),)
$(exec_test)
Modified: trunk/uClibc/test/regex/Makefile
===================================================================
--- trunk/uClibc/test/regex/Makefile 2006-03-02 16:37:41 UTC (rev 14427)
+++ trunk/uClibc/test/regex/Makefile 2006-03-02 16:41:04 UTC (rev 14428)
@@ -7,15 +7,6 @@
CFLAGS_tst-regex2 := -std=c99
-CFLAGS-OMIT_testregex := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexc := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexf := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexi := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexl := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexn := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexp := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexr := -D_GNU_SOURCE
-
OPTS_testregex := < basic.dat
OPTS_testregexc := < categorize.dat
OPTS_testregexf := < forcedassoc.dat
Modified: trunk/uClibc/test/regex/testregex.c
===================================================================
--- trunk/uClibc/test/regex/testregex.c 2006-03-02 16:37:41 UTC (rev 14427)
+++ trunk/uClibc/test/regex/testregex.c 2006-03-02 16:41:04 UTC (rev 14428)
@@ -985,7 +985,7 @@
}
static char*
-getline(FILE* fp)
+my_getline(FILE* fp)
{
static char buf[32 * 1024];
@@ -1343,7 +1343,7 @@
signal(SIGBUS, gotcha);
signal(SIGSEGV, gotcha);
}
- while (p = getline(fp))
+ while (p = my_getline(fp))
{
/* parse: */
More information about the uClibc-cvs
mailing list