heimdal: changed to use custmain for toolchain build and also build slc

security/heimdal/heimdal.conf

@@ -25,20 +25,28 @@ autogen=1
 # build static tools we need for cross-compiling at stage 1
 # tools needed: asn1_compile
 if atstage toolchain; then
-	heimdal_toolchain_premake() {
+	heimdal_toolchain_custmain() {
+		./autogen.sh
+		eval $configscript $confopt $extraconfopt
 		eval $MAKE -C include krb5-types.h
 		eval $MAKE -C lib/roken
 		eval $MAKE -C lib/vers
 		eval $MAKE -C lib/com_err
+		eval $MAKE -C lib/asn1
+		# also build slc
+		eval $MAKE -C lib/libedit
+		eval $MAKE -C lib/sl
+		# install asn1_compile
+		eval $MAKE -C lib/asn1 asn1_compile $makeopt install
+		# install slc
+		eval $MAKE -C lib/sl slc $makeopt install
 	}
-	hook_add premake 9 'heimdal_toolchain_premake'
+	custmain='heimdal_toolchain_custmain'
 
 	prefix=
 	set_confopt
 
 	var_append extraconfopt ' ' "--disable-shared"
-	var_insert makeopt ' ' "-C lib/asn1"
-	var_insert makeinstopt ' ' "-C lib/asn1"
 fi
 
 if atstage native; then