summaryrefslogtreecommitdiffhomepage
path: root/build.sh
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-05-25 21:08:15 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-05-25 21:16:29 +0000
commitc288dfb0f33ef4a713680190b5b2e2ca69cfb171 (patch)
treedfe0fd8db081bb89c75a3de2d437cf07a8062f48 /build.sh
parentffcc9c6a9dfeb481fb342accb71579ae5478ea74 (diff)
downloadmidipix_build-c288dfb0f33ef4a713680190b5b2e2ca69cfb171.tar.bz2
midipix_build-c288dfb0f33ef4a713680190b5b2e2ca69cfb171.tar.xz
- Followup to <ffcc9c6a9dfeb481fb342accb71579ae5478ea74>.
- Fix pseudo-local variable leaks in build.subr. - Log $PKG_* environment variables prior to building w/ pkg.build. - Always build musl w/ -g2 -O0. - Remove obsolete export CFLAGS=${CFLAGS_LVL${BUILD_LVL}} command from build.sh. - Handle bin/libpsxscl.{last,log} in midipix.sh. - Add autoconf to $CHECK_PREREQ_CMDS. - Include `Create `Midipix mintty shell' shortcut.vbs' in the tarball. - Changes the $PKG_ENV_VARS_EXTRA variable name-value pair separator from `,' to `:'. - Link bash and coreutils statically. - Changes the level 2 package --prefix to `', installing to DESTDIR=$PREFIX_LVL2.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 2719cfad..09bba166 100755
--- a/build.sh
+++ b/build.sh
@@ -30,7 +30,7 @@ check_path_vars ${CHECK_PATH_VARS}; check_prereqs ${PREREQ_CMDS};
{(
update_build_status build_start; build_times_init; trap "clean_build_status abort; exit 1" HUP INT TERM USR1 USR2;
log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
-log_env_vars ${LOG_ENV_VARS}; [ ${ARG_CLEAN:-0} -eq 1 ] && clean_prefix;
+log_env_vars "build (global)" ${LOG_ENV_VARS}; [ ${ARG_CLEAN:-0} -eq 1 ] && clean_prefix;
mkdir -p ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_TARGET} ${WORKDIR};
if [ -d ${PREFIX}/usr -o -f ${PREFIX}/usr -o -L ${PREFIX}/usr ]; then
rm -rf ${PREFIX}/usr;
@@ -63,7 +63,6 @@ for BUILD_LVL in 0 1 2 3; do
(set -o errexit -- $(split . ${BUILD_SCRIPT_FNAME%%.build*}); \
SCRIPT_FNAME=${BUILD_SCRIPT_FNAME}; \
SCRIPT_NAME=${SCRIPT_FNAME%%.build*}; \
- export CFLAGS="$(eval echo \${CFLAGS_LVL${BUILD_LVL}})"; \
export PREFIX_LVL="$(eval echo \${PREFIX_LVL${BUILD_LVL}})"; \
_PWD=$(pwd); cd ${WORKDIR}; \
for SCRIPT_SOURCE in build.subr ${SCRIPT_NAME}.vars \
@@ -120,7 +119,8 @@ if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ] \
tar -cJpf ${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz\
$(find_with_no_paths "${TARBALL_EXCLUDE_PATHS} native/lib.bak" . \
- -mindepth 1 -maxdepth 2 -type d -not -path ./native) midipix.sh;
+ -mindepth 1 -maxdepth 2 -type d -not -path ./native) \
+ "Create \`Midipix mintty shell' shortcut.vbs" midipix.sh;
log_msg info "Finished building distribution tarball.";
sha256sum ${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.xz\
> ${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.sha256sum;