Fix build on 9-current and recent 8-stable

3 files changed, 59 insertions, 0 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 9cc4f0a87967..97d0e9d75608 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	20100127
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
diff --git a/security/clamav-devel/files/patch-libclamav__c++__Makefile.am b/security/clamav-devel/files/patch-libclamav__c++__Makefile.am
new file mode 100644
index 000000000000..b87251cc99c1
--- /dev/null
+++ b/security/clamav-devel/files/patch-libclamav__c++__Makefile.am
@@ -0,0 +1,29 @@
+--- libclamav/c++/Makefile.am
++++ libclamav/c++/Makefile.am
+@@ -19,7 +19,7 @@ LLVM_INCLUDES=-I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
+ # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
+ LLVM_DEFS=-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE
+ AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/.. -I$(top_builddir)/../../ $(LLVM_INCLUDES) $(LLVM_DEFS)
+-AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -fno-rtti
++AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+ ACLOCAL_AMFLAGS=-I m4
+ if DEBUG_BUILD
+ LLVM_CONFIG=llvm/Debug/bin/llvm-config
+@@ -43,7 +43,7 @@ lli_LDADD=libllvmbitreader.la libllvmfullcodegen.la libllvmjit.la
+ libclamavcxx_la_LIBADD=libllvmjit.la
+ libclamavcxx_la_DEPENDENCIES=libllvmjit.la libllvmcodegen.la libllvmsystem.la
+ libclamavcxx_la_LDFLAGS=-no-undefined
+-libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
++libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)
+ libclamavcxx_la_SOURCES = bytecode2llvm.cpp
+ if BUILD_X86
+ libclamavcxx_la_LIBADD+=libllvmx86codegen.la
+@@ -818,7 +818,7 @@ lli_SOURCES=\
+     llvm/tools/lli/lli.cpp
+ 
+ llc_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)
+-llc_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-rtti
++llc_CXXFLAGS=$(LLVM_CXXFLAGS)
+ llc_LDADD=libllvmbitreader.la libllvmasmprinter.la libllvmasmparser.la $(lli_LDADD)
+ llc_SOURCES=\
+     llvm/lib/MC/MCInstPrinter.cpp\
diff --git a/security/clamav-devel/files/patch-libclamav__c++__Makefile.in b/security/clamav-devel/files/patch-libclamav__c++__Makefile.in
new file mode 100644
index 000000000000..7db8171447ca
--- /dev/null
+++ b/security/clamav-devel/files/patch-libclamav__c++__Makefile.in
@@ -0,0 +1,29 @@
+--- libclamav/c++/Makefile.in
++++ libclamav/c++/Makefile.in
+@@ -901,7 +901,7 @@ LLVM_INCLUDES = -I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
+ # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
+ LLVM_DEFS = -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE
+ AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/.. -I$(top_builddir)/../../ $(LLVM_INCLUDES) $(LLVM_DEFS)
+-AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -fno-rtti
++AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
+ ACLOCAL_AMFLAGS = -I m4
+ @DEBUG_BUILD_FALSE@LLVM_CONFIG = llvm/Release/bin/llvm-config
+ @DEBUG_BUILD_TRUE@LLVM_CONFIG = llvm/Debug/bin/llvm-config
+@@ -928,7 +928,7 @@ libclamavcxx_la_DEPENDENCIES = libllvmjit.la libllvmcodegen.la \
+ 	libllvmsystem.la $(am__append_2) $(am__append_6) \
+ 	$(am__append_10)
+ libclamavcxx_la_LDFLAGS = -no-undefined
+-libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
++libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)
+ libclamavcxx_la_SOURCES = bytecode2llvm.cpp
+ LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros
+ TBLGENFILES = llvm/include/llvm/Intrinsics.gen X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterInfo.inc X86GenInstrNames.inc X86GenInstrInfo.inc\
+@@ -1539,7 +1539,7 @@ lli_SOURCES = \
+     llvm/tools/lli/lli.cpp
+ 
+ llc_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS)
+-llc_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
++llc_CXXFLAGS = $(LLVM_CXXFLAGS)
+ llc_LDADD = libllvmbitreader.la libllvmasmprinter.la libllvmasmparser.la $(lli_LDADD)
+ llc_SOURCES = \
+     llvm/lib/MC/MCInstPrinter.cpp\