diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-03-05 19:10:22 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-03-05 19:31:59 +0000 |
| commit | b8dc4b98a1ad4cc8b0f2bceca817a6dfa20da341 (patch) | |
| tree | 160f02c763137d7973e0f6d85293fc94bb1e2c00 | |
| parent | 7c6f2c010fa1b1d2c5f0c416c45294ff36d96d24 (diff) | |
| download | midipix_build-b8dc4b98a1ad4cc8b0f2bceca817a6dfa20da341.tar.bz2 midipix_build-b8dc4b98a1ad4cc8b0f2bceca817a6dfa20da341.tar.xz | |
- Followup to last commit.
- Fixed bzip2 and musl (libc) installation wrt. $PREFIX_LVL/bin/{bz*,ldd}
symlinks (reported by avih.)
| -rw-r--r-- | 006.musl.full.build | 2 | ||||
| -rw-r--r-- | 300.bzip2.vars | 15 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | build.subr | 10 |
4 files changed, 25 insertions, 4 deletions
diff --git a/006.musl.full.build b/006.musl.full.build index 72871ad8..b3cc5e66 100644 --- a/006.musl.full.build +++ b/006.musl.full.build @@ -54,6 +54,8 @@ fi; if ! is_build_script_done build; then ./lazy -e ${_install} \ -x build; + [ "${3}" = native ] && \ + ln -sf ../lib/libc.so ${PREFIX_LVL}/bin/ldd; set_build_script_done build finish; fi; diff --git a/300.bzip2.vars b/300.bzip2.vars new file mode 100644 index 00000000..0dfccc15 --- /dev/null +++ b/300.bzip2.vars @@ -0,0 +1,15 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_bzip2_install_post() { + set -- bzcmp bzegrep bzfgrep bzless; + while [ ${#} -gt 0 ]; do + [ -f ${PKG_PREFIX}/bin/${1} ] &&\ + ln -sf $(basename $(readlink ${PKG_PREFIX}/bin/${1}))\ + ${PKG_PREFIX}/bin/${1}; + shift; + done; +}; + +# vim:filetype=sh @@ -26,10 +26,10 @@ esac; shift; done; clear_env_with_except ${CLEAR_ENV_VARS_EXCEPT}; check_path_vars ${CHECK_PATH_VARS}; check_prereqs ${PREREQ_CMDS}; mkdir -p ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_TARGET} ${WORKDIR}; +update_build_status build_start; build_times_init; trap clean_build_status HUP INT TERM USR1 USR2; {( -update_build_status build_start; build_times_init; 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; BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}}; @@ -45,7 +45,7 @@ clean_prefix() { clean_build_status() { set -- BUILD_STATUS_IN_PROGRESS_FNAME BUILD_STATUS_PROGRESS_FNAME BUILD_STATUS_TARBALL_PROGRESS_FNAME; while [ ${#} -gt 0 ]; do - rm -f ${1}; shift; + rm -f $(get_var_unsafe ${1}); shift; done; touch ${PREFIX}/BUILD_ABORTED_AT_$(date %Y-%m-%d-%H-%M-%S); log_msg fail "Build aborted at $(date %Y-%m-%d-%H-%M-%S)."; }; @@ -306,8 +306,12 @@ update_build_status() { touch ${BUILD_STATUS_PROGRESS_FNAME:=${PREFIX}/BUILD_STARTED_AT_${BUILD_DATE_START:=$(date %Y-%m-%d-%H-%M-%S)}}; ;; build_finish) - [ -f ${BUILD_STATUS_PROGRESS_FNAME} ] &&\ - rm -f ${BUILD_STATUS_PROGRESS_FNAME}; + if [ -f ${BUILD_STATUS_PROGRESS_FNAME} ]; then + _ubs_bsp_fname=${BUILD_STATUS_PROGRESS_FNAME}; + unset BUILD_STATUS_PROGRESS_FNAME; + rm -f ${_ubs_bsp_fname}; + unset _ubs_bsp_fname; + fi; touch ${BUILD_STATUS_FINISHED_AT_FNAME:=${PREFIX}/BUILD_FINISHED_AT_$(date ${TIMESTAMP_FMT_STATUS_FILES})}; rotate_files BUILD_FINISHED_AT_\* 8; ln -sf ${BUILD_STATUS_FINISHED_AT_FNAME}\ |