github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-26 12:04:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SV 31155] Parse order-only tokens in second expansion results.

Browse Source
This commit is contained in:
Paul Smith 2013-09-22 16:59:04 -04:00
parent c3524b83b9
commit fd30db1290
4 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2013-09-22 Paul Smith <psmith@gnu.org> 2013-09-22 Paul Smith <psmith@gnu.org>
* implicit.c (pattern_search): After second expansion be sure to
handle order-only markers inside the expansion properly.
Fixes Savannah bug #31155.
* guile.c (guile_define_module): Technically a void* cannot * guile.c (guile_define_module): Technically a void* cannot
contain a pointer-to-function and some compilers warn about this. contain a pointer-to-function and some compilers warn about this.
Cast the function pointers. Cast the function pointers.

39
implicit.c
View File

@ -574,6 +574,7 @@ pattern_search (struct file *file, int archive,
{ {
int add_dir = 0; int add_dir = 0;
unsigned int len; unsigned int len;
struct dep **dptr;
nptr = get_next_word (nptr, &len); nptr = get_next_word (nptr, &len);
if (nptr == 0) if (nptr == 0)
@ -616,6 +617,9 @@ pattern_search (struct file *file, int archive,
add_dir = 1; add_dir = 1;
} }
/* Set up for the next word. */
nptr += len;
/* Initialize and set file variables if we haven't already /* Initialize and set file variables if we haven't already
done so. */ done so. */
if (!file_vars_initialized) if (!file_vars_initialized)
@ -634,20 +638,33 @@ pattern_search (struct file *file, int archive,
/* Perform the 2nd expansion. */ /* Perform the 2nd expansion. */
p = variable_expand_for_file (depname, file); p = variable_expand_for_file (depname, file);
dptr = &dl;
/* Parse the expanded string. */ /* Parse the results into a deps list. */
dl = PARSE_FILE_SEQ (&p, struct dep, order_only ? MAP_NUL : MAP_PIPE, do
add_dir ? dir : NULL, PARSEFS_NONE);
for (d = dl; d != NULL; d = d->next)
{ {
++deps_found; /* Parse the expanded string. */
if (order_only) struct dep *dp = PARSE_FILE_SEQ (&p, struct dep,
d->ignore_mtime = 1; order_only ? MAP_NUL : MAP_PIPE,
} add_dir ? dir : NULL, PARSEFS_NONE);
*dptr = dp;
/* Set up for the next word. */ for (d = dp; d != NULL; d = d->next)
nptr += len; {
++deps_found;
if (order_only)
d->ignore_mtime = 1;
dptr = &d->next;
}
/* If we stopped due to an order-only token, note it. */
if (*p == '|')
{
order_only = 1;
++p;
}
}
while (*p != '\0');
} }
/* If there are more than max_pattern_deps prerequisites (due to /* If there are more than max_pattern_deps prerequisites (due to

4
tests/ChangeLog
View File

@ -1,5 +1,9 @@
2013-09-22 Paul Smith <psmith@gnu.org> 2013-09-22 Paul Smith <psmith@gnu.org>
* scripts/features/se_implicit: Verify that order-only tokens
inside second expansion are parsed correctly.
Test for Savannah bug #31155.
* run_make_tests.pl (set_more_defaults): If we can't find * run_make_tests.pl (set_more_defaults): If we can't find
gnumake.h based on the make program we might be running from a gnumake.h based on the make program we might be running from a
remote build directory. Parse the Makefile for the right path. remote build directory. Parse the Makefile for the right path.

12
tests/scripts/features/se_implicit
View File

@ -244,5 +244,17 @@ sim_%: \
unlink('a'); unlink('a');
# Ensure that order-only tokens embedded in second expansions are parsed
run_make_test(q!
.SECONDEXPANSION:
PREREQS=p1|p2
P2=p2
all : foo bar
f%o: $$(PREREQS) ; @echo '$@' from '$^' and '$|'
b%r: p1|$$(P2) ; @echo '$@' from '$^' and '$|'
p% : ; : $@
!,
"", ": p1\n: p2\nfoo from p1 and p2\nbar from p1 and p2\n");
# This tells the test driver that the perl test script executed properly. # This tells the test driver that the perl test script executed properly.
1; 1;