add explicit deps and use proper catalystrc

Author: 2b57

assets/baserepo_overlay/scripts/bootstrap.sh

@@ -297,7 +297,6 @@ einfo "Using libc       : ${myLIBC}"
 einfo "Using texinfo    : ${myTEXINFO}"
 einfo "Using zlib       : ${myZLIB}"
 einfo "Using ncurses    : ${myNCURSES}"
-einfo "Using perl       : ${myPERL}"
 [[ -n ${myEXTRA} ]] && einfo "Using extra pkgs : ${myEXTRA}"
 
 echo -------------------------------------------------------------------------------
@@ -336,7 +335,7 @@ if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
 	else
 		STRAP_EMERGE_POSARGS="\
 			${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
-			${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB} ${myPERL} ${myEXTRA}"
+			${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB} ${myEXTRA}"
 	fi
 	${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
 	echo -------------------------------------------------------------------------------

assets/config/catalyst.conf

@@ -34,7 +34,7 @@ distdir="/var/cache/distfiles"
 # GENTOO_MIRRORS, or any other environment variables needed for building.
 # The envscript file sets environment variables like so:
 # export FOO="bar"
-envscript="/etc/catalyst/catalystrc"
+envscript="@ENVSCRIPT@"
 
 # Internal hash function catalyst should use for things like autoresume,
 # seedcache, etc.  The default and fastest is crc32.  You should not ever need

assets/config/catalystrc.base

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# adjust accordingly
+export MAKEOPTS="-j4"

assets/config/catalystrc.stage2

@@ -0,0 +1,3 @@
+export myGCC="sys-devel/clang"
+export myBINUTILS="sys-devel/llvm"
+export myEXTRA="dev-lang/perl sys-devel/lld sys-libs/compiler-rt sys-devel/clang-runtime sys-libs/libcxx sys-libs/libcxxabi sys-libs/llvm-libunwind sys-devel/llvm-common sys-devel/clang-common"

assets/scripts/stage-builder.sh

@@ -39,6 +39,7 @@ SEEDFILE_BASE="/var/tmp/catalyst/builds"
 ARCH=$(get_from_spec "subarch")
 PREFIX=$(get_from_spec source_subpath | cut -d '/' -f1)
 FLAVOUR=$(get_from_spec profile | cut -d ':' -f1 || "gentoo")
+STAGE=$(get_from_spec target)
 SNAPSHOT_FILE="$SNAPSHOT_BASE/$FLAVOUR-$TIMESTAMP.tar.bz2"
 BASEURL="https://bouncer.gentoo.org/fetch/root/all/releases/$ARCH/autobuilds"
 
@@ -74,12 +75,20 @@ eval "mount -t overlay overlay -o lowerdir=\"$DEFAULT_REPO_DIR\",upperdir=\"$MOU
 
 einfo "Portage overlay is located at $MOUNT_OVERLAY"
 
+einfo "Creating catalystrc file"
+cp -rf "$THIS_OVERLAY_DIR/assets/config/catalystrc.base" "$CONFTEMP/catalystrc" || exit 1
+
+if [ "$STAGE" == "stage2" ]; then
+	cat "$THIS_OVERLAY_DIR/assets/config/catalystrc.stage2" >> "$CONFTEMP/catalystrc"
+fi
+
 # at this point is safe to assume that there's no external catalyst config
 # available, so stick to the bundled one
 if [ -z "$CATALYST" ]; then
 	einfo "Tweaking catalyst config to use just created portage overlay"
 	cp -f "$THIS_OVERLAY_DIR/assets/config/catalyst.conf" "$CONFTEMP/catalyst.conf" || exit 1
 	sed -i "s:@PORTDIR@:$MOUNT_OVERLAY:g" "$CONFTEMP/catalyst.conf" || exit 1
+	sed -i "s:@ENVSCRIPT@:$CONFTEMP/catalystrc:g" "$CONFTEMP/catalyst.conf"  || exit 1
 	CATALYST="$CONFTEMP/catalyst.conf"
 fi
 
@@ -91,6 +100,7 @@ fi
 
 # check for snapshot
 if [ ! -f "$SNAPSHOT_FILE" ]; then
+	echo "Missing snapshot: $SNAPSHOT_FILE"
 	einfo "Getting current snapshot..."
 
 	CMD="catalyst -s $TIMESTAMP"