Received: by mail.netbsd.org (Postfix, from userid 605) id 38A5884D22; Mon, 17 Oct 2022 01:47:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 691E284D46 for ; Mon, 17 Oct 2022 01:47:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 9tsOQmCMK-1H for ; Mon, 17 Oct 2022 01:47:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DD2CC84CED for ; Mon, 17 Oct 2022 01:47:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D6CD5FA90; Mon, 17 Oct 2022 01:47:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1665971237228100" MIME-Version: 1.0 Date: Mon, 17 Oct 2022 01:47:17 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/lang/erlang To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20221017014717.D6CD5FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1665971237228100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Mon Oct 17 01:47:17 UTC 2022 Modified Files: pkgsrc/lang/erlang: options.mk Removed Files: pkgsrc/lang/erlang: PLIST.hipe Log Message: erlang: fix default builds on some platforms (HiPE is gone) The Erlang 24 release removed the HiPE module. Un-break builds where the erlang-hipe option was (often default) enabled. To generate a diff of this commit: cvs rdiff -u -r1.10 -r0 pkgsrc/lang/erlang/PLIST.hipe cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/erlang/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1665971237228100 Content-Disposition: inline Content-Length: 1551 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/erlang/options.mk diff -u pkgsrc/lang/erlang/options.mk:1.14 pkgsrc/lang/erlang/options.mk:1.15 --- pkgsrc/lang/erlang/options.mk:1.14 Sat Oct 15 18:04:10 2022 +++ pkgsrc/lang/erlang/options.mk Mon Oct 17 01:47:17 2022 @@ -1,20 +1,11 @@ -# $NetBSD: options.mk,v 1.14 2022/10/15 18:04:10 triaxx Exp $ +# $NetBSD: options.mk,v 1.15 2022/10/17 01:47:17 gutteridge Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.erlang -PKG_SUPPORTED_OPTIONS= java erlang-hipe +PKG_SUPPORTED_OPTIONS= java PKG_OPTIONS_OPTIONAL_GROUPS= odbc PKG_OPTIONS_GROUP.odbc= iodbc unixodbc PKG_SUGGESTED_OPTIONS= # empty -### -### Activate HiPE by default on some systems or if the user has -### defined the erlang-hipe option in mk.conf -### -.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ - (${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || \ - ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS") -PKG_SUGGESTED_OPTIONS+= erlang-hipe -.endif .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" || \ ${OPSYS} == "Linux" @@ -35,16 +26,6 @@ PLIST_SRC+= PLIST.java CONFIGURE_ARGS+= --without-javac .endif -# Some hipe-related files are still installed even when --disable-hipe -# is supplied, and these should remain in the general PLIST. -.if !empty(PKG_OPTIONS:Merlang-hipe) -CONFIGURE_ARGS+= --enable-hipe -PLIST_SRC+= PLIST.hipe -USE_TOOLS+= gm4 # needs -P -.else -CONFIGURE_ARGS+= --disable-hipe -.endif - ### ### Provide iodbc/unixodbc option support ### --_----------=_1665971237228100--