CVS commit: pkgsrc/lang/erlang

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

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.

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
 ###