diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-05-10 12:53:10 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 08:32:37 +0100 |
| commit | 8bada957224783d21cdacbfeaf6ee4ccc4f72b74 (patch) | |
| tree | e6b2e470d03756a378c252b46bb7631a61bd7a5f /meta/recipes-extended/tcp-wrappers | |
| parent | 95b7cafafcaa4dda7328632475003f5778ab95bd (diff) | |
| download | openembedded-core-8bada957224783d21cdacbfeaf6ee4ccc4f72b74.tar.gz openembedded-core-8bada957224783d21cdacbfeaf6ee4ccc4f72b74.tar.bz2 openembedded-core-8bada957224783d21cdacbfeaf6ee4ccc4f72b74.zip | |
tcp-wrappers: Rename conflicting variable STRINGS in Makefile
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/tcp-wrappers')
| -rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch new file mode 100644 index 0000000000..7650600ab5 --- /dev/null +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch @@ -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 \ diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index ba940085ff..3586a354cd 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -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" |