[67842] trunk/dports/sysutils/clamav
dluke at macports.org
dluke at macports.org
Wed May 19 08:23:13 PDT 2010
Revision: 67842
http://trac.macports.org/changeset/67842
Author: dluke at macports.org
Date: 2010-05-19 08:23:11 -0700 (Wed, 19 May 2010)
Log Message:
-----------
Version bump, clamav to 0.96.1
Modified Paths:
--------------
trunk/dports/sysutils/clamav/Portfile
Removed Paths:
-------------
trunk/dports/sysutils/clamav/files/ppc_llvm_patch.diff
Modified: trunk/dports/sysutils/clamav/Portfile
===================================================================
--- trunk/dports/sysutils/clamav/Portfile 2010-05-19 15:12:39 UTC (rev 67841)
+++ trunk/dports/sysutils/clamav/Portfile 2010-05-19 15:23:11 UTC (rev 67842)
@@ -4,8 +4,7 @@
PortGroup muniversal 1.0
name clamav
-version 0.96
-revision 3
+version 0.96.1
categories sysutils
maintainers geeklair.net:dluke
description clamav antivirus software
@@ -17,9 +16,9 @@
license GPL
homepage http://www.clamav.net
master_sites sourceforge
-checksums md5 28ac7bec4cc03627a8e2d6e8647ee661 \
- sha1 be7cb37f2a6121cacc3cd3969eee212b96ef6b57 \
- rmd160 d9147d1da4fc7fa3e8d42b25c58a93f6bbaa588b
+checksums md5 38e7870db6e9ad0e569518499a6f3651 \
+ sha1 cdb24490f402748cbfb57cc87592fe77b470e0a5 \
+ rmd160 f0708b921c8b01a4309fe741ec141ab8cbdf2351
platforms darwin
configure.args --mandir=${prefix}/share/man \
@@ -41,11 +40,6 @@
configure.cflags {-O0}
}
-platform powerpc {
- patchfiles-append ppc_llvm_patch.diff
- #https://wwws.clamav.net/bugzilla/show_bug.cgi?id=1921
- }
-
post-destroot {
file rename "${destroot}${prefix}/etc/freshclam.conf" "${destroot}${prefix}/etc/example-freshclam.conf"
file rename "${destroot}${prefix}/etc/clamd.conf" "${destroot}${prefix}/etc/example-clamd.conf"
Deleted: trunk/dports/sysutils/clamav/files/ppc_llvm_patch.diff
===================================================================
--- trunk/dports/sysutils/clamav/files/ppc_llvm_patch.diff 2010-05-19 15:12:39 UTC (rev 67841)
+++ trunk/dports/sysutils/clamav/files/ppc_llvm_patch.diff 2010-05-19 15:23:11 UTC (rev 67842)
@@ -1,185 +0,0 @@
-diff --git ChangeLog ChangeLog
-index 4049421..2c93a08 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,14 @@
-+Fri Apr 2 16:19:26 EEST 2010 (edwin)
-+-------------------------------------
-+ * libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp:
-+ Fix the previous PowerPC workaround to not crash when not using the JIT.
-+
-+Fri Apr 2 13:09:54 EEST 2010 (edwin)
-+------------------------------------
-+ * libclamav/c++/{bytecode2llvm.cpp,llvm/lib/ExecutionEngine/JIT/JIT.cpp,
-+ llvm/lib/Target/PowerPC/PPCISelLowering.cpp}: Workaround LLVM JIT PowerPC relocation bug (bb #1921).
-+ Based on Gary Benson's workaround for OpenJDK Shark / IcedTea.
-+
- Wed Mar 31 19:30:59 CEST 2010 (tk)
- ----------------------------------
- * V 0.96
-diff --git libclamav/c++/bytecode2llvm.cpp libclamav/c++/bytecode2llvm.cpp
-index 003894e..3b38259 100644
---- libclamav/c++/bytecode2llvm.cpp
-+++ libclamav/c++/bytecode2llvm.cpp
-@@ -1428,6 +1428,7 @@ public:
- if (verifyFunction(*F, PrintMessageAction) == 0) {
- DEBUG(errs() << "Generating code\n");
- // Codegen current function as executable machine code.
-+ EE->getPointerToFunction(Functions[j]);
- void *code = EE->getPointerToFunction(F);
- DEBUG(errs() << "Code generation finished\n");
-
-@@ -1472,6 +1473,7 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
-
- EE->addGlobalMapping(CF->FHandler, (void*)(intptr_t)jit_exception_handler);
- EE->InstallLazyFunctionCreator(noUnknownFunctions);
-+ EE->getPointerToFunction(CF->FHandler);
-
- std::vector<const Type*> args;
- args.push_back(PointerType::getUnqual(Type::getInt8Ty(Context)));
-@@ -1527,12 +1529,15 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
- CF->FRealmemset = Function::Create(DummyTy, GlobalValue::ExternalLinkage,
- "memset", M);
- EE->addGlobalMapping(CF->FRealmemset, (void*)(intptr_t)memset);
-+ EE->getPointerToFunction(CF->FRealmemset);
- CF->FRealMemmove = Function::Create(DummyTy, GlobalValue::ExternalLinkage,
- "memmove", M);
- EE->addGlobalMapping(CF->FRealMemmove, (void*)(intptr_t)memmove);
-+ EE->getPointerToFunction(CF->FRealMemmove);
- CF->FRealmemcpy = Function::Create(DummyTy, GlobalValue::ExternalLinkage,
- "memcpy", M);
- EE->addGlobalMapping(CF->FRealmemcpy, (void*)(intptr_t)memcpy);
-+ EE->getPointerToFunction(CF->FRealmemcpy);
-
- args.clear();
- args.push_back(PointerType::getUnqual(Type::getInt8Ty(Context)));
-@@ -1542,6 +1547,7 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M
- args, false);
- CF->FRealmemcmp = Function::Create(FuncTy_5, GlobalValue::ExternalLinkage, "memcmp", M);
- EE->addGlobalMapping(CF->FRealmemcmp, (void*)(intptr_t)memcmp);
-+ EE->getPointerToFunction(CF->FRealmemcmp);
- }
-
- }
-@@ -1755,6 +1761,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)
- llvm_unreachable("invalid api type");
- }
- EE->addGlobalMapping(F, dest);
-+ EE->getPointerToFunction(F);
- apiFuncs[i] = F;
- }
-
-@@ -1774,6 +1781,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)
- Function *SFail = Function::Create(FTy, Function::ExternalLinkage,
- "__stack_chk_fail", M);
- EE->addGlobalMapping(SFail, (void*)(intptr_t)jit_ssp_handler);
-+ EE->getPointerToFunction(SFail);
-
- for (unsigned i=0;i<bcs->count;i++) {
- const struct cli_bc *bc = &bcs->all_bcs[i];
-diff --git libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp
-index b6c3367..4fc7d5a 100644
---- libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp
-+++ libclamav/c++/llvm/lib/ExecutionEngine/JIT/JIT.cpp
-@@ -255,7 +255,12 @@ public:
- MutexGuard guard(Lock);
- JITs.erase(jit);
- }
-- void *getPointerToNamedFunction(const char *Name) const {
-+ bool empty() {
-+ MutexGuard guard(Lock);
-+ return JITs.empty();
-+ }
-+ void *getPointerToNamedFunction(const char *Name,
-+ bool AbortOnFailure = true) const {
- MutexGuard guard(Lock);
- assert(JITs.size() != 0 && "No Jit registered");
- //search function in every instance of JIT
-@@ -267,7 +272,19 @@ public:
- }
- // The function is not available : fallback on the first created (will
- // search in symbol of the current program/library)
-- return (*JITs.begin())->getPointerToNamedFunction(Name);
-+ return (*JITs.begin())->getPointerToNamedFunction(Name, AbortOnFailure);
-+ }
-+ void *getPointerToGlobalIfAvailable(GlobalValue *V) const {
-+ MutexGuard guard(Lock);
-+ assert(JITs.size() != 0 && "No Jit registered");
-+ //search function in every instance of JIT
-+ for (SmallPtrSet<JIT*, 1>::const_iterator Jit = JITs.begin(),
-+ end = JITs.end();
-+ Jit != end; ++Jit) {
-+ if (void *Ptr = (*Jit)->getPointerToGlobalIfAvailable(V))
-+ return Ptr;
-+ }
-+ return 0;
- }
- };
- ManagedStatic<JitPool> AllJits;
-@@ -283,6 +300,22 @@ extern "C" {
- }
- }
-
-+extern "C" {
-+ // getPointerToNamedFunctionOrNull - same as the above, but returns
-+ // NULL instead of aborting if the function cannot be found.
-+ void *getPointerToNamedFunctionOrNull(const char *Name) {
-+ return !AllJits->empty() ? AllJits->getPointerToNamedFunction(Name, false) : 0;
-+ }
-+}
-+
-+extern "C" {
-+ // getPointerToGlobalIfAvailable - same as the above, but for global
-+ // variables, and only for those that have been codegened already.
-+ void *getPointerToGlobalIfAvailable(GlobalValue *V) {
-+ return !AllJits->empty() ? AllJits->getPointerToGlobalIfAvailable(V) : 0;
-+ }
-+}
-+
- JIT::JIT(Module *M, TargetMachine &tm, TargetJITInfo &tji,
- JITMemoryManager *JMM, CodeGenOpt::Level OptLevel, bool GVsWithCode)
- : ExecutionEngine(M), TM(tm), TJI(tji), AllocateGVsWithCode(GVsWithCode),
-diff --git libclamav/c++/llvm/lib/Target/PowerPC/PPCISelLowering.cpp libclamav/c++/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-index 3d81afa..167a0e6 100644
---- libclamav/c++/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ libclamav/c++/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -2450,6 +2450,9 @@ void PrepareTailCall(SelectionDAG &DAG, SDValue &InFlag, SDValue &Chain,
- InFlag = Chain.getValue(1);
- }
-
-+extern "C" void *getPointerToNamedFunctionOrNull(const char *Name);
-+extern "C" void *getPointerToGlobalIfAvailable(GlobalValue *Value);
-+
- static
- unsigned PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag,
- SDValue &Chain, DebugLoc dl, int SPDiff, bool isTailCall,
-@@ -2462,6 +2465,29 @@ unsigned PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag,
-
- unsigned CallOpc = isSVR4ABI ? PPCISD::CALL_SVR4 : PPCISD::CALL_Darwin;
-
-+ // XXX Work around for http://llvm.org/bugs/show_bug.cgi?id=5201
-+ // and http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399
-+ // for Shark.
-+ //
-+ // If the callee is an ExternalSymbol node, and the symbol can be
-+ // resolved to a function pointer, then insert that pointer as a
-+ // constant. This causes the next block of code to fall into the
-+ // block that emits an indirect call. This works around
-+ //
-+ // This works for Shark because the only kinds of call that Shark
-+ // makes that do not already fall into the indirect call block are
-+ // calls to pre-existing external functions.
-+ if (ExternalSymbolSDNode *S = dyn_cast<ExternalSymbolSDNode>(Callee)) {
-+ void *FuncPtr = getPointerToNamedFunctionOrNull(S->getSymbol());
-+ if (FuncPtr)
-+ Callee = DAG.getConstant((uint64_t) FuncPtr, PtrVT);
-+ }
-+ if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee)) {
-+ void *FuncPtr = getPointerToGlobalIfAvailable(G->getGlobal());
-+ if (FuncPtr)
-+ Callee = DAG.getConstant((uint64_t) FuncPtr, PtrVT);
-+ }
-+
- // If the callee is a GlobalAddress/ExternalSymbol node (quite common, every
- // direct call is) turn it into a TargetGlobalAddress/TargetExternalSymbol
- // node so that legalize doesn't hack it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100519/5435cc26/attachment-0001.html>
More information about the macports-changes
mailing list