summaryrefslogtreecommitdiff
path: root/scripts/setup-abuild
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/setup-abuild')
-rwxr-xr-xscripts/setup-abuild46
1 files changed, 36 insertions, 10 deletions
diff --git a/scripts/setup-abuild b/scripts/setup-abuild
index 95e56d787..a0f8fb9d0 100755
--- a/scripts/setup-abuild
+++ b/scripts/setup-abuild
@@ -2,21 +2,46 @@
##
# This script is to be called from 'bootstrap.sh', not sourced.
-# PATH is fully contained. We install to 'MCMTOOLS/abuild/'.
+# PATH is fully contained. We install to 'MCMTOOLS/sys', which
+# will add (and may overwrite) in some cases. This process is
+# destructive. We do this so that we may easily 'chroot' later.
#
HERE="$(dirname $(readlink -f ${0}))";
-DEST="${MCMTOOLS}/abuild";
-export PATH="${MCMTOOLS}/sys/bin:${MCMTOOLS}/host/bin:${DEST}/bin";
+DEST=/usr/local;
+
+git config --global http.sslCAInfo "${CURL_CA_BUNDLE}";
mkdir -p "${DEST}";
-cd "${DEST}";
+cd "${DEST}"; # this directory will already exist if correct
+
+if false; then # provided by latest 'bootstrap'
+##
+# Perl
+#
+nprl=perl;
+vprl=5.36.0;
+test ! -f ._${vprl}-${vprl} && \
+(
+ test ! -d ${nprl}-${vprl} \
+ && curl -s https://www.cpan.org/src/${vprl%%.*}.0/perl-${vprl}.tar.gz \
+ | tar -xzf - \
+ ;
+ cd ${nprl}-${vprl};
+ rm -fr x; mkdir x; cd x;
+ ../Configure -des;
+ make -j$(nproc);
+ make install;
+)
+touch ._${nprl}-${vprl};
+rm -fr ${nprl}-${vprl};
+fi
##
# OpenSSL
#
nssl=openssl;
-vssl=1.1.1m;
+vssl=1.1.1s;
test ! -f ._${nssl}-${vssl} && \
(
test ! -d ${nssl}-${vssl} \
@@ -41,16 +66,17 @@ rm -fr ${nssl}-${vssl};
# abuild
#
nbld=abuild;
-vbld=681ef9dfcf6e57bdda767efed7e50ce8e9de0563
+vbld=ee13f777d56e8f3e8848fec9a422430a66292cc1;
test ! -f ._${nbld}-${vbld} && \
(
test ! -d ${nbld}-${vbld} \
&& git clone https://git.alpinelinux.org/${nbld} ${nbld}-${vbld} \
;
cd abuild-${vbld};
- patch -p1 --forward < "${HERE}/patches/0001-allow-untrusted.diff" || true; # FIXME
- patch -p1 --forward < "${HERE}/patches/0001-etc-apk-keys.diff" || true; # FIXME
- patch -p1 --forward < "${HERE}/patches/0001-extra-lib-paths.diff" || true; # FIXME
+ git checkout ${vbld};
+# patch -p1 --forward < "${HERE}/patches/0001-allow-untrusted.diff" || true; # FIXME
+# patch -p1 --forward < "${HERE}/patches/0001-etc-apk-keys.diff" || true; # FIXME
+# patch -p1 --forward < "${HERE}/patches/0001-extra-lib-paths.diff" || true; # FIXME
rm -fr x; mkdir x; cd x;
export SSL_CFLAGS="-I${DEST}/include -I${MCMTOOLS}/sys/include";
export SSL_LDFLAGS="-L${DEST}/lib -L${MCMTOOLS}/sys/lib";
@@ -145,7 +171,7 @@ test ! -f ._${nsam}-${vsam} &&
PREFIX="" \
DESTDIR="${DEST}" \
;
-
+
)
touch ._${nsam}-${vsam};
rm -fr ${nsam}-${vsam};