Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 6 | |
| 7 | --- tcp_wrappers_7.6/Makefile.orig 2013-04-18 23:41:58.277981740 +0200 |
| 8 | +++ tcp_wrappers_7.6/Makefile 2013-04-18 23:42:42.513978966 +0200 |
| 9 | @@ -309,7 +309,7 @@ |
| 10 | pyramid: |
| 11 | @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ |
| 12 | LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ="environ.o vfprintf.o" \ |
| 13 | - STRINGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \ |
| 14 | + STRINGS_FLAGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \ |
| 15 | NETGROUP="-DNETGROUP -DUSE_GETDOMAIN" TLI= all |
| 16 | |
| 17 | # Untested. |
| 18 | @@ -419,7 +419,7 @@ |
| 19 | # Uncomment the following if your C library does not provide the |
| 20 | # strchr/strrchr/memcmp routines, but comes with index/rindex/bcmp. |
| 21 | # |
| 22 | -#STRINGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy |
| 23 | +#STRINGS_FLAGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy |
| 24 | |
| 25 | ################################################################# |
| 26 | # System dependencies: selection of non-default object libraries. |
| 27 | @@ -690,7 +690,7 @@ |
| 28 | $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ |
| 29 | -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ |
| 30 | -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ |
| 31 | - $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ |
| 32 | + $(UCHAR) $(TABLES) $(STRINGS_FLAGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ |
| 33 | $(VSYSLOG) $(HOSTNAME) |
| 34 | |
| 35 | LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ |