You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2013/04/26 00:47:56 UTC
[1/2] git commit: TS-1820: Clean up unused arguments. This provides a
fix for flex generated files.
Updated Branches:
refs/heads/master b3e3f0e06 -> ba1be0b39
TS-1820: Clean up unused arguments. This provides a fix for flex generated files.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2273d2aa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2273d2aa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2273d2aa
Branch: refs/heads/master
Commit: 2273d2aa9e6d538d29adc6b498e5de88e19c4e3a
Parents: 16df6a2
Author: Alan M. Carroll <amc@chocobo.(none)>
Authored: Thu Apr 25 15:44:33 2013 -0700
Committer: Alan M. Carroll <amc@chocobo.(none)>
Committed: Thu Apr 25 15:44:33 2013 -0700
----------------------------------------------------------------------
configure.ac | 6 +++++-
lib/tsconfig/Makefile.am | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2273d2aa/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 9f2ed72..0f955ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,10 +728,12 @@ case $host_os in
*) # gcc
# This is useful for finding odd conversions
# common_opt="-pipe -Wall -Werror -Wconversion -Wno-sign-conversion"
- common_opt="-pipe -Wall -Werror -Wno-error=unused-parameter -Wunused-parameter"
+ common_opt="-pipe -Wall -Werror -Wunused-parameter"
debug_opt="-ggdb3 $common_opt"
release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
+ # Special options for flex generated .c files
+ flex_cflags="-Wno-unused-parameter"
;;
esac
;; # linux*)
@@ -807,6 +809,8 @@ cc_oflag_dbg=$debug_opt
cxx_oflag_opt="$release_opt $cxx_opt $cxx_rel"
cxx_oflag_dbg="$debug_opt $cxx_opt $cxx_dbg"
+AC_SUBST([FLEX_CFLAGS], $flex_cflags)
+
SHARED_CFLAGS=-fPIC
SHARED_LDFLAGS=-shared
SHARED_CXXFLAGS=-fPIC
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2273d2aa/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 7864472..be89743 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -19,6 +19,7 @@
lib_LTLIBRARIES = libtsconfig.la
noinst_PROGRAMS = test-tsconfig
libtsconfig_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
+CFLAGS = @CFLAGS@ @FLEX_CFLAGS@
AM_YFLAGS = --yacc -d -p tsconfig
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by am...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ba1be0b3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ba1be0b3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ba1be0b3
Branch: refs/heads/master
Commit: ba1be0b39f84eb42a63edd9d93e301ead5c95d11
Parents: 2273d2a b3e3f0e
Author: Alan M. Carroll <amc@chocobo.(none)>
Authored: Thu Apr 25 15:47:07 2013 -0700
Committer: Alan M. Carroll <amc@chocobo.(none)>
Committed: Thu Apr 25 15:47:07 2013 -0700
----------------------------------------------------------------------
lib/ts/ink_defs.h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------