sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

tcp-wrappers: Rename conflicting variable STRINGS in Makefile 

(From OE-Core rev: 8bada957224783d21cdacbfeaf6ee4ccc4f72b74)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2013-05-10 12:53:10 +02:00 committed by Richard Purdie
parent cef2446eb3
commit 7802e5cd1e
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch Normal file
View File

@ -0,0 +1,35 @@
STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings)
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- tcp_wrappers_7.6/Makefile.orig 2013-04-18 23:41:58.277981740 +0200
+++ tcp_wrappers_7.6/Makefile 2013-04-18 23:42:42.513978966 +0200
@@ -309,7 +309,7 @@
pyramid:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ="environ.o vfprintf.o" \
- STRINGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \
+ STRINGS_FLAGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \
NETGROUP="-DNETGROUP -DUSE_GETDOMAIN" TLI= all
# Untested.
@@ -419,7 +419,7 @@
# Uncomment the following if your C library does not provide the
# strchr/strrchr/memcmp routines, but comes with index/rindex/bcmp.
#
-#STRINGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy
+#STRINGS_FLAGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy
#################################################################
# System dependencies: selection of non-default object libraries.
@@ -690,7 +690,7 @@
$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
- $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
+ $(UCHAR) $(TABLES) $(STRINGS_FLAGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
$(VSYSLOG) $(HOSTNAME)
LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \

1
meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
View File

@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
file://socklen_t.patch \
file://tcpdchk_libwrapped.patch \
file://ldflags.patch \
file://rename_strings_variable.patch \
\
file://try-from.8 \
file://safe_finger.8"