Date: Fri, 24 Jan 2020 20:56:54 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523986 - in head/devel/py-llvmlite: . files Message-ID: <202001242056.00OKus2u092166@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Jan 24 20:56:53 2020 New Revision: 523986 URL: https://svnweb.freebsd.org/changeset/ports/523986 Log: devel/py-llvmlite: - Update to 0.31.0, which supports LLVM versions 7 and 8 - Patch to respect CXX and friends. Apparently, this was the reason for failure on powerpc64, so remove BROKEN - Clean up port Makefile PR: 243429 Approved by: David Kalliecharan (maintainer) Modified: head/devel/py-llvmlite/Makefile head/devel/py-llvmlite/distinfo head/devel/py-llvmlite/files/patch-ffi-Makefile.freebsd Modified: head/devel/py-llvmlite/Makefile ============================================================================== --- head/devel/py-llvmlite/Makefile Fri Jan 24 20:53:31 2020 (r523985) +++ head/devel/py-llvmlite/Makefile Fri Jan 24 20:56:53 2020 (r523986) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= llvmlite -DISTVERSION= 0.25.0 -PORTREVISION= 3 +DISTVERSION= 0.31.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,27 +13,32 @@ COMMENT= Lightweight LLVM python binding for writing J LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11_powerpc64= fails to compile: clang++: not found -BROKEN_FreeBSD_12_powerpc64= fails to compile: clang++: not found +BUILD_DEPENDS= ${PY_ENUM34} \ + llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +RUN_DEPENDS= ${PY_ENUM34} \ + llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -BUILD_DEPENDS= ${PY_ENUM34} -RUN_DEPENDS= ${PY_ENUM34} -LIB_DEPENDS= libLLVM-6.0.so:devel/llvm60 - -# Python 2.7,3.4+ -USES= python fortran +USES= compiler:c++11-lib python fortran USE_PYTHON= distutils autoplist +CXXFLAGS= -fPIC -# devel/llvm60 required as of version 0.23.0 -LLVM_VER= 60 MAKE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} -post-patch: -# Required, because Makefile.freebsd does not see VARS from this Makefile - @${REINPLACE_CMD} -e "s|%%_GCC_VER%%|${_GCC_VER}|" \ - ${WRKSRC}/ffi/Makefile.freebsd +# compatible LLVM versions for llvmlite versions 0.29.0 - ... +LLVM_SUPPORTED_MIN= 70 +LLVM_SUPPORTED_MAX= 80 +.include <bsd.port.pre.mk> + +.if ${LLVM_DEFAULT:S,-devel,990,} < ${LLVM_SUPPORTED_MIN} +LLVM_VER= ${LLVM_SUPPORTED_MIN} +.elif ${LLVM_DEFAULT:S,-devel,990,} > ${LLVM_SUPPORTED_MAX} +LLVM_VER= ${LLVM_SUPPORTED_MAX} +.else +LLVM_VER= ${LLVM_DEFAULT} +.endif + post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/llvmlite/binding/libllvmlite.so -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/devel/py-llvmlite/distinfo ============================================================================== --- head/devel/py-llvmlite/distinfo Fri Jan 24 20:53:31 2020 (r523985) +++ head/devel/py-llvmlite/distinfo Fri Jan 24 20:56:53 2020 (r523986) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542234868 -SHA256 (llvmlite-0.25.0.tar.gz) = fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025 -SIZE (llvmlite-0.25.0.tar.gz) = 102079 +TIMESTAMP = 1578993365 +SHA256 (llvmlite-0.31.0.tar.gz) = 22ab2b9d7ec79fab66ac8b3d2133347de86addc2e2df1b3793e523ac84baa3c8 +SIZE (llvmlite-0.31.0.tar.gz) = 110810 Modified: head/devel/py-llvmlite/files/patch-ffi-Makefile.freebsd ============================================================================== --- head/devel/py-llvmlite/files/patch-ffi-Makefile.freebsd Fri Jan 24 20:53:31 2020 (r523985) +++ head/devel/py-llvmlite/files/patch-ffi-Makefile.freebsd Fri Jan 24 20:56:53 2020 (r523986) @@ -1,11 +1,13 @@ ---- ffi/Makefile.freebsd.orig 2016-09-03 17:26:16.399458000 +0000 -+++ ffi/Makefile.freebsd 2016-09-03 17:26:38.057115000 +0000 +--- ffi/Makefile.freebsd.orig 2020-01-03 17:02:39 UTC ++++ ffi/Makefile.freebsd @@ -1,7 +1,7 @@ - CXX = clang++ -std=c++11 -stdlib=libc++ - CXXFLAGS = $(LLVM_CXXFLAGS) +-CXX = clang++ -std=c++11 -stdlib=libc++ +-CXXFLAGS = $(LLVM_CXXFLAGS) -LDFLAGS = $(LLVM_LDFLAGS) -+LDFLAGS = $(LLVM_LDFLAGS) -shared -Wl,-rpath=$(LOCALBASE)/lib/gcc%%_GCC_VER%% ++CXX ?= clang++ ++CXXFLAGS := $(CPPFLAGS) $(CXXFLAGS) $(LLVM_CXXFLAGS) ++LDFLAGS := $(LDFLAGS) $(LLVM_LDFLAGS) LIBS = $(LLVM_LIBS) INCLUDE = core.h SRC = assembly.cpp bitcode.cpp core.cpp initfini.cpp module.cpp value.cpp \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001242056.00OKus2u092166>