Date: Sun, 20 Feb 2011 14:20:46 +0800 (CST) From: Denny Lin <dennylin93@hs.ntnu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/154900: [PATCH] Allow users to use LLVM from ports for security/clamav Message-ID: <20110220062046.5E0F24B7824@mail.hs.ntnu.edu.tw> Resent-Message-ID: <201102200630.p1K6UAoj068977@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154900
>Category: ports
>Synopsis: [PATCH] Allow users to use LLVM from ports for security/clamav
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 20 06:30:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Denny Lin
>Release: FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD cnmc32.hs.ntnu.edu.tw 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Fri Sep 3 15:42:55 CST 2010 root@cnmc32.hs.ntnu.edu.tw:/usr/obj/usr/src/sys/CNMC32 amd64
>Description:
Allow users to select bundled LLVM or LLVM from ports.
>How-To-Repeat:
>Fix:
--- Makefile.patch begins here ---
--- Makefile.orig 2011-02-20 14:09:01.000000000 +0800
+++ Makefile 2011-02-20 14:07:43.000000000 +0800
@@ -18,7 +18,8 @@
LHA "Enable lha archives support" On \
UNZOO "Enable zoo archives support" On \
UNRAR "Enable rar archives support" On \
- LLVM "Enable JIT Bytecode compiler" On \
+ LLVM "Enable JIT Bytecode compiler (bundled LLVM)" On \
+ LLVM_PORTS "Enable JIT Bytecode compiler (from Ports)" Off \
TESTS "Run compile-time tests (req. python)" On \
MILTER "Compile the milter interface" Off \
LDAP "libmilter was built with LDAP" Off \
@@ -139,9 +140,16 @@
CONFIGURE_ARGS+=--without-iconv
.endif
-.if defined(WITH_LLVM) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
+.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
CONFIGURE_ARGS+=--enable-llvm
USE_GMAKE= yes
+. if defined(WITH_LLVM_PORTS)
+BUILD_DEPENDS+= llvm-config:${PORTSDIR}/devel/llvm
+CONFIGURE_ARGS+=--with-system-llvm=${LOCALBASE}/bin/llvm-config
+. endif
+. if defined(WITH_LLVM) && defined(WITH_LLVM_PORTS)
+IGNORE=Select only one LLVM
+. endif
. if defined(WITH_TESTS)
USE_PYTHON_BUILD= yes
. endif
@@ -203,7 +211,7 @@
@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
${WRKSRC}/libclamunrar/unrar.c
-.if defined(WITH_LLVM) && defined(WITH_TESTS)
+.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && defined(WITH_TESTS)
pre-configure:
@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
${ECHO_MSG} ""; \
--- Makefile.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110220062046.5E0F24B7824>