[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 6d52179a6eec2866c501c9e4f66cfeef42e21e35
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Dec 12 17:20:31 2009 +0200

    gcc 3.4.6 doesn't support -Wno-variadic-macros, disable the flag.

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index d8d326c..25c8154 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -661,14 +661,16 @@ libllvmasmparser_la_SOURCES=\
  llvm/lib/AsmParser/Parser.cpp
 
 libllvminterpreter_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-libllvminterpreter_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-missing-field-initializers -Wno-variadic-macros
+libllvminterpreter_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#TODO: configure check -Wno-missing-field-initializers -Wno-variadic-macros
 libllvminterpreter_la_SOURCES=\
     llvm/lib/ExecutionEngine/Interpreter/Execution.cpp\
     llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp\
     llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
 
 libgoogletest_la_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-libgoogletest_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-missing-field-initializers -Wno-variadic-macros
+libgoogletest_la_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+# -Wno-missing-field-initializers -Wno-variadic-macros
 libgoogletest_la_SOURCES=\
     llvm/utils/unittest/googletest/gtest-death-test.cc\
     llvm/utils/unittest/googletest/gtest-filepath.cc\
@@ -679,7 +681,8 @@ libgoogletest_la_SOURCES=\
     llvm/utils/unittest/UnitTestMain/TestMain.cpp
 
 llvmunittest_ADT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_ADT_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_ADT_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_ADT_LDADD=libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_ADT_SOURCES=\
     llvm/unittests/ADT/APFloatTest.cpp\
@@ -696,7 +699,8 @@ llvmunittest_ADT_SOURCES=\
     llvm/unittests/ADT/TwineTest.cpp
 
 llvmunittest_Support_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_Support_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_Support_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_Support_LDADD=libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_Support_SOURCES=\
     llvm/unittests/Support/AllocatorTest.cpp\
@@ -708,7 +712,8 @@ llvmunittest_Support_SOURCES=\
     llvm/unittests/Support/raw_ostream_test.cpp
 
 llvmunittest_VMCore_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_VMCore_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_VMCore_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_VMCore_LDADD=libgoogletest.la libllvmtarget.la libllvmipa.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_VMCore_SOURCES=\
     llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp\
@@ -717,7 +722,8 @@ llvmunittest_VMCore_SOURCES=\
     llvm/unittests/VMCore/PassManagerTest.cpp
 
 llvmunittest_JIT_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_JIT_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_JIT_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_JIT_LDADD=libgoogletest.la libllvmasmparser.la $(libclamavcxx_la_LIBADD)
 llvmunittest_JIT_SOURCES=\
     llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp\
@@ -725,7 +731,8 @@ llvmunittest_JIT_SOURCES=\
     llvm/unittests/ExecutionEngine/JIT/JITTest.cpp
 
 llvmunittest_ExecutionEngine_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_ExecutionEngine_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_ExecutionEngine_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_ExecutionEngine_LDADD=libgoogletest.la libllvminterpreter.la $(libclamavcxx_la_LIBADD)
 llvmunittest_ExecutionEngine_SOURCES=\
     llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index f1ec35f..ba05c02 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -1510,14 +1510,16 @@ libllvmasmparser_la_SOURCES = \
  llvm/lib/AsmParser/Parser.cpp
 
 libllvminterpreter_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-libllvminterpreter_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-missing-field-initializers -Wno-variadic-macros
+libllvminterpreter_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#TODO: configure check -Wno-missing-field-initializers -Wno-variadic-macros
 libllvminterpreter_la_SOURCES = \
     llvm/lib/ExecutionEngine/Interpreter/Execution.cpp\
     llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp\
     llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
 
 libgoogletest_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-libgoogletest_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-missing-field-initializers -Wno-variadic-macros
+libgoogletest_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+# -Wno-missing-field-initializers -Wno-variadic-macros
 libgoogletest_la_SOURCES = \
     llvm/utils/unittest/googletest/gtest-death-test.cc\
     llvm/utils/unittest/googletest/gtest-filepath.cc\
@@ -1528,7 +1530,8 @@ libgoogletest_la_SOURCES = \
     llvm/utils/unittest/UnitTestMain/TestMain.cpp
 
 llvmunittest_ADT_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_ADT_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_ADT_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_ADT_LDADD = libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_ADT_SOURCES = \
     llvm/unittests/ADT/APFloatTest.cpp\
@@ -1545,7 +1548,8 @@ llvmunittest_ADT_SOURCES = \
     llvm/unittests/ADT/TwineTest.cpp
 
 llvmunittest_Support_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_Support_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_Support_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_Support_LDADD = libgoogletest.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_Support_SOURCES = \
     llvm/unittests/Support/AllocatorTest.cpp\
@@ -1557,7 +1561,8 @@ llvmunittest_Support_SOURCES = \
     llvm/unittests/Support/raw_ostream_test.cpp
 
 llvmunittest_VMCore_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_VMCore_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_VMCore_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_VMCore_LDADD = libgoogletest.la libllvmtarget.la libllvmipa.la libllvmcore.la libllvmsupport.la libllvmsystem.la
 llvmunittest_VMCore_SOURCES = \
     llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp\
@@ -1566,7 +1571,8 @@ llvmunittest_VMCore_SOURCES = \
     llvm/unittests/VMCore/PassManagerTest.cpp
 
 llvmunittest_JIT_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_JIT_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_JIT_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_JIT_LDADD = libgoogletest.la libllvmasmparser.la $(libclamavcxx_la_LIBADD)
 llvmunittest_JIT_SOURCES = \
     llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp\
@@ -1574,7 +1580,8 @@ llvmunittest_JIT_SOURCES = \
     llvm/unittests/ExecutionEngine/JIT/JITTest.cpp
 
 llvmunittest_ExecutionEngine_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/utils/unittest/googletest/include
-llvmunittest_ExecutionEngine_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -Wno-variadic-macros
+llvmunittest_ExecutionEngine_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+#-Wno-variadic-macros
 llvmunittest_ExecutionEngine_LDADD = libgoogletest.la libllvminterpreter.la $(libclamavcxx_la_LIBADD)
 llvmunittest_ExecutionEngine_SOURCES = \
     llvm/unittests/ExecutionEngine/ExecutionEngineTest.cpp

-- 
Debian repository for ClamAV