From owner-svn-ports-all@freebsd.org Wed Mar 20 21:40:04 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D37B15386F7; Wed, 20 Mar 2019 21:40:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 03D9682822; Wed, 20 Mar 2019 21:40:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE76526948; Wed, 20 Mar 2019 21:40:03 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2KLe30l054178; Wed, 20 Mar 2019 21:40:03 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2KLe3ID054177; Wed, 20 Mar 2019 21:40:03 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201903202140.x2KLe3ID054177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 20 Mar 2019 21:40:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496388 - head/lang/rubinius X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/lang/rubinius X-SVN-Commit-Revision: 496388 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 03D9682822 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2019 21:40:04 -0000 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