Date: Wed, 20 Mar 2019 21:40:03 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496388 - head/lang/rubinius Message-ID: <201903202140.x2KLe3ID054177@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Mar 20 21:40:03 2019 New Revision: 496388 URL: https://svnweb.freebsd.org/changeset/ports/496388 Log: Switch to LLVM_DEFAULT from an hardcoded llvm40. This removes the LLVM40 option. PR: 236477, 231286 Approved by: ashish (maintainer) Modified: head/lang/rubinius/Makefile Modified: head/lang/rubinius/Makefile ============================================================================== --- head/lang/rubinius/Makefile Wed Mar 20 20:58:59 2019 (r496387) +++ head/lang/rubinius/Makefile Wed Mar 20 21:40:03 2019 (r496388) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \ ${LOCALBASE}/bin/bison:devel/bison \ - ${LLVM_CONFIG_PATH}:${LLVM_PORT} + ${LLVM_CONFIG_PATH}:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libyaml.so:textproc/libyaml HAS_CONFIGURE= yes @@ -36,14 +36,8 @@ CONFIGURE_ARGS= -P "${PREFIX}" \ --stagingdir "${STAGEDIR}${PREFIX}" --with-execinfo \ --system-name ${OPSYS} -OPTIONS_RADIO= LLVM -OPTIONS_DEFAULT= LLVM40 -OPTIONS_RADIO_LLVM= LLVM40 - ONLY_FOR_ARCHS= amd64 -LLVM40_DESC= LLVM 4.0 - USES= gmake perl5 readline tar:bzip2 libedit ssl USE_LOCALE= en_US.UTF-8 USE_RUBY= yes @@ -68,14 +62,9 @@ MAKE_ENV+= GEM_PATH=${GEM_PATH} F_OS= ${OPSYS:tl} F_MAJOR= ${OSREL:C/\..*$//} FREEBSD_DIR= ${F_ARCH}-${F_OS}-${F_MAJOR} -LLVM_CC_PATH= ${LOCALBASE}/bin/${LLVM_CC} -LLVM_CXX_PATH= ${LOCALBASE}/bin/${LLVM_CXX} -LLVM_CONFIG_PATH= ${LOCALBASE}/bin/${LLVM_CONFIG} - -LLVM40_VARS= LLVM_CONFIG=llvm-config40 \ - LLVM_PORT=devel/llvm40 \ - LLVM_CC=clang40 \ - LLVM_CXX=clang++40 +LLVM_CC_PATH= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} +LLVM_CXX_PATH= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} +LLVM_CONFIG_PATH= ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} .include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903202140.x2KLe3ID054177>