From d01c0269b8e5e467f82cd28392579c4c43fe63bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 20 Nov 2017 15:27:06 +0000 Subject: subr/pkg_{autoconf,configure,patch}.subr: reference ${PKG_BASE_DIR} instead of ${WORKDIR}. subr/pkg_build_dir.subr: {build,install} packages nested within ${PKG_BUILD_DIR}/. subr/pkg_distclean.subr: removed from repository. subr/pkg_{extract,fetch}.subr: {extract,fetch} within ${PKG_BASE_DIR}. subr/pkg_install.subr: install to ../destdir to facilitate post-installation processing. subr/pkg_setup_env.subr: set & create ${PKG_BASE_DIR}. subr/pre_subdirs.subr: always create ${PREFIX}/bin. vars/build.vars: consistently use ${PKG_{PREFIX,MAKE_INSTALL_VNAME,MAKEFLAGS_INSTALL}}. vars/env.vars, *: cleanup. --- subr/mode_check_updates.subr | 4 +- subr/pkg_autoconf.subr | 35 +++++----- subr/pkg_build_dir.subr | 12 ++-- subr/pkg_configure.subr | 4 +- subr/pkg_distclean.subr | 12 ---- subr/pkg_extract.subr | 16 ++--- subr/pkg_fetch.subr | 18 ++--- subr/pkg_install.subr | 39 ++++++----- subr/pkg_patch.subr | 10 +-- subr/pkg_patch_pre.subr | 3 +- subr/pkg_setup_env.subr | 3 + subr/pkg_work_dir.subr | 6 +- subr/pre_setup_env.subr | 8 +-- subr/pre_subdirs.subr | 1 + vars/build.vars | 156 ++++++++++++++++++++++++------------------- vars/check_updates.vars | 24 +++---- vars/clang_host.vars | 4 -- vars/cmake.vars | 11 +++ vars/cmake_host.vars | 1 + vars/cparser.vars | 12 +--- vars/env.vars | 53 ++++++++------- vars/gcc.vars | 24 +++---- vars/libfirm.vars | 16 +++++ vars/musl.vars | 12 ++-- vars/psxstub.vars | 2 +- vars/ruby.vars | 16 +++++ vars/ruby_host.vars | 1 + 27 files changed, 277 insertions(+), 226 deletions(-) delete mode 100644 subr/pkg_distclean.subr create mode 120000 vars/cmake_host.vars mode change 100644 => 120000 vars/cparser.vars create mode 100644 vars/ruby.vars create mode 120000 vars/ruby_host.vars diff --git a/subr/mode_check_updates.subr b/subr/mode_check_updates.subr index 56423a5b..9699d360 100644 --- a/subr/mode_check_updates.subr +++ b/subr/mode_check_updates.subr @@ -14,13 +14,13 @@ modep_cpu_get_fnames() { _cpugf_pname="${_cpugf_pname%%/*}"; cu_url_index="https://github.com/${_cpugf_uname%%/*}/${_cpugf_pname%%/*}/releases/"; unset _cpu_uname _cpu_pname; - cu_fnames="$(wget ${WGET_ARGS} -qO- ${cu_url_index} |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- ${cu_url_index} |\ sed -n '//s/^.*\([a-zA-Z]\+-\|v\|\)\(.\+\)<\/span>.*$/\3/p')"; cu_fname_base="${cu_name}"; cu_fname_ext="${cu_fname#v${cu_version}.}"; else cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '/[hH][rR][eE][fF]="[^"]\+"/s/^.*[hH][rR][eE][fF]="\([^"]\+\)".*$/\1/p')"; fi; fi; diff --git a/subr/pkg_autoconf.subr b/subr/pkg_autoconf.subr index fd201282..8a0ea124 100644 --- a/subr/pkg_autoconf.subr +++ b/subr/pkg_autoconf.subr @@ -4,18 +4,18 @@ pkg_autoconf() { local __; - if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure" -o \ - -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" -o \ - -e "${WORKDIR}/${PKG_SUBDIR}/configure.in" -o \ - -e "${WORKDIR}/${PKG_SUBDIR}/config.guess" ]; then - if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\ - && [ ! -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]; then + if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" -o \ + -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" -o \ + -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" -o \ + -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/config.guess" ]; then + if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ + && [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then for __ in bootstrap bootstrap.sh autogen.sh ""; do if [ -z "${__}" ]; then - (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf)\ + (build_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf)\ || exit 1 && break; - elif [ -e "${WORKDIR}/${PKG_SUBDIR}/${__}" ]; then - for ___ in "${WORKDIR}/${PKG_SUBDIR}/build-aux" "${WORKDIR}/${PKG_SUBDIR}"; do + elif [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${__}" ]; then + for ___ in "${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux" "${PKG_BASE_DIR}/${PKG_SUBDIR}"; do if [ -e "${___}" ]; then echo install -m 0700 \ "${MIDIPIX_BUILD_PWD}/etc/config.sub" \ @@ -26,20 +26,21 @@ pkg_autoconf() { break; fi; done; - (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && "${SHELL}" "${__}")\ + (build_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && "${SHELL}" "${__}")\ || exit 1 && break; fi; done; fi; - find "${WORKDIR}/${PKG_SUBDIR}" -name config.sub \ - -exec echo mv -- {} {}.orig \; \ - -exec mv -- {} {}.orig \; \ - -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ + find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.sub \ + -exec echo mv -- {} {}.orig \; \ + -exec mv -- {} {}.orig \; \ + -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; if [ "${PKG_BUILD_TYPE}" != host ]; then - for __ in ${PKG_BUILD_DIR} ${PKG_CONFIG_CACHE_EXTRA}; do - build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${WORKDIR}/${__}/"; - done; + build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${PKG_BUILD_DIR}/"; + if [ -n "${PKG_CONFIG_CACHE_EXTRA}" ]; then + build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${PKG_BASE_DIR}/${PKG_CONFIG_CACHE_EXTRA}/"; + fi; fi; fi; }; diff --git a/subr/pkg_build_dir.subr b/subr/pkg_build_dir.subr index e9104ab2..2143e057 100644 --- a/subr/pkg_build_dir.subr +++ b/subr/pkg_build_dir.subr @@ -4,13 +4,15 @@ pkg_build_dir() { if [ -z "${PKG_BUILD_DIR}" ]; then - if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]\ - || [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\ - || [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.in" ]; then - set_build_dir "${PKG_SUBDIR}" "${PKG_BUILD_TYPE:-native}"; + if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]\ + || [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ + || [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" ]; then + PKG_BUILD_DIR="${PKG_BASE_DIR}/obj"; else - PKG_BUILD_DIR="${PKG_SUBDIR}"; + PKG_BUILD_DIR="${PKG_BASE_DIR}/${PKG_SUBDIR}"; fi; + else + PKG_BUILD_DIR="${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; fi; }; diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index d63b16e6..acc67a09 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -4,9 +4,9 @@ pkg_configure() { if [ -n "${PKG_CONFIGURE}" ]; then - PKG_CONFIGURE="${WORKDIR}/${PKG_CONFIGURE}"; + PKG_CONFIGURE="${PKG_BASE_DIR}/${PKG_CONFIGURE}"; else - PKG_CONFIGURE="${WORKDIR}/${PKG_SUBDIR}/configure"; + PKG_CONFIGURE="${PKG_BASE_DIR}/${PKG_SUBDIR}/configure"; fi; if [ -x "${PKG_CONFIGURE}" ]; then CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \ diff --git a/subr/pkg_distclean.subr b/subr/pkg_distclean.subr deleted file mode 100644 index 68c09dd4..00000000 --- a/subr/pkg_distclean.subr +++ /dev/null @@ -1,12 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -pkg_distclean() { - if [ "${PKG_SUBDIR}" != "${PKG_BUILD_DIR}" ]; then - build_fileop rm "${WORKDIR}/${PKG_BUILD_DIR}"; - build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}"; - fi; -}; - -# vim:filetype=sh diff --git a/subr/pkg_extract.subr b/subr/pkg_extract.subr index f6ddff2e..909dc730 100644 --- a/subr/pkg_extract.subr +++ b/subr/pkg_extract.subr @@ -5,21 +5,21 @@ pkg_extract() { if [ -n "${PKG_URL}" ]\ && [ "${PKG_URL_TYPE:-wget}" = wget ]; then - build_fileop rm "${WORKDIR}/${PKG_SUBDIR}"; + build_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}"; if [ "${PKG_FNAME##*.tar.}" = "bz2" ]; then - bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; elif [ "${PKG_FNAME##*.tar.}" = "gz" ]; then - gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; elif [ "${PKG_FNAME##*.tar.}" = "xz" ]; then - xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; elif [ "${PKG_FNAME##*.t}" = "bz2" ]; then - bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; elif [ "${PKG_FNAME##*.t}" = "gz" ]; then - gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; elif [ "${PKG_FNAME##*.t}" = "xz" ]; then - xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -; + xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${PKG_BASE_DIR}" -xf -; else - tar -C "${WORKDIR}" -xf "${DLCACHEDIR}/${PKG_FNAME}"; + tar -C "${PKG_BASE_DIR}" -xf "${DLCACHEDIR}/${PKG_FNAME}"; fi; fi; }; diff --git a/subr/pkg_fetch.subr b/subr/pkg_fetch.subr index 37c2439e..7c71c344 100644 --- a/subr/pkg_fetch.subr +++ b/subr/pkg_fetch.subr @@ -14,7 +14,7 @@ pkgp_fetch() { || [ -e "${_url_dst}.fetched" ]; then return 0; else - wget ${WGET_ARGS} -c -O "${_url_dst}" "${_url}"; + wget ${DEFAULT_WGET_ARGS} -c -O "${_url_dst}" "${_url}"; fi; if [ -n "${_sha256sum_src}" ]; then set -- $(openssl dgst -sha256 "${_url_dst}"); shift $((${#}-1)); @@ -30,7 +30,7 @@ pkgp_fetch() { }; pkgp_fetch_git() { - local _subdir="${1}" _url="${2}" _branch="${3}"; + local _tgtdir="${1}" _subdir="${2}" _url="${3}" _branch="${4}"; if [ "${ARG_OFFLINE:-0}" -eq 0 ]; then if [ -e "${DLCACHEDIR}/${_subdir}" ]; then (build_fileop cd "${DLCACHEDIR}/${_subdir}" &&\ @@ -45,27 +45,27 @@ pkgp_fetch_git() { fi; fi; fi; - build_fileop rm "${WORKDIR}/${_subdir}"; - build_fileop cp "${DLCACHEDIR}/${_subdir}" "${WORKDIR}"; + build_fileop rm "${_tgtdir}/${_subdir}"; + build_fileop cp "${DLCACHEDIR}/${_subdir}" "${_tgtdir}"; }; pkgp_fetch_urls_git() { - local _url_spec _subdir _url _git_branch; - for _url_spec in ${@}; do + local _tgtdir="${2}" _url_spec _subdir _url _git_branch; + for _url_spec in ${1}; do _subdir="${_url_spec%=*}"; _url="${_url_spec#*=}"; _url="${_url%@*}"; if [ "${_url_spec#*@}" != "${_url_spec}" ]; then _git_branch=${_url_spec#*@}; fi; - pkgp_fetch_git ${_subdir} ${_url} ${_git_branch}; + pkgp_fetch_git "${_tgtdir}" "${_subdir}" "${_url}" "${_git_branch}"; done; }; pkg_fetch() { if [ -n "${1}" ]; then if [ "${1}" = "-git" ]; then - shift; pkgp_fetch_urls_git "${1}"; + shift; pkgp_fetch_urls_git "${1}" "${PKG_BASE_DIR}"; else pkgp_fetch "${1}" "${2}"; fi; @@ -74,7 +74,7 @@ pkg_fetch() { pkgp_fetch "${PKG_URL}" "${PKG_SHA256SUM}" "${PKG_FNAME}"; fi; if [ -n "${PKG_URLS_GIT}" ]; then - pkgp_fetch_urls_git "${PKG_URLS_GIT}"; + pkgp_fetch_urls_git "${PKG_URLS_GIT}" "${PKG_BASE_DIR}"; fi; fi; }; diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index 8e4a5b7a..b4ccbded 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -67,7 +67,7 @@ pkgp_install_libs() { pkgp_install_pkgconfig() { local __; - for __ in $(find "${WORKDIR}/${PKG_BUILD_DIR}" -name \*.pc); do + for __ in $(find "${PKG_BUILD_DIR}" -name \*.pc); do if grep -Eq '^libdir=[^$]+$' "${__}"; then sed -i -e '/^libdir=[^$]\+$/s/^libdir=\(.\+\)$/libdir=${exec_prefix}\1/' \ -e '/^exec_prefix=$/s/^.*$/exec_prefix=${prefix}/' \ @@ -79,30 +79,33 @@ pkgp_install_pkgconfig() { pkg_install() { pkgp_install_pkgconfig; if [ ${PKG_NO_MAKE_INSTALL:-0} -eq 0 ]; then - run_cmd_unsplit make \ - ${PKG_MAKEFLAGS_INSTALL} \ - ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ - AR=${AR} CC=${CC} RANLIB=${RANLIB} \ + build_fileop mkdir ../destdir; + build_fileop mkdir ../destdir/bin; + build_fileop mkdir ../destdir/lib; + build_fileop mkdir ../destdir/sbin; + build_fileop mkdir ../destdir/share/man/man1; + build_fileop mkdir ../destdir/share/man; + build_fileop rm ../destdir/usr; + build_fileop ln_symbolic . ../destdir/usr; + build_fileop rm ../destdir/man; + build_fileop ln_symbolic share/man ../destdir/man; + run_cmd_unsplit make \ + ${PKG_MAKEFLAGS_INSTALL} \ + ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ + AR=${AR} CC=${CC} RANLIB=${RANLIB} \ "${PKG_CFLAGS_INSTALL:+CFLAGS=${PKG_CFLAGS_INSTALL}}" \ "${PKG_CFLAGS_INSTALL_EXTRA:+CFLAGS+=${PKG_CFLAGS_INSTALL_EXTRA}}" \ "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ - "LIBTOOL=${PKG_SLIBTOOL:-slibtool}" \ + "LIBTOOL=${PKG_SLIBTOOL:-slibtool}" \ + "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PWD}/../destdir/" \ ${PKG_INSTALL_TARGET:=install}; + build_fileop mkdir "${PKG_PREFIX}"; + tar -C ../destdir -cpf - . | tar -C "${PKG_PREFIX}" -xpf -; if [ -n "${PKG_PREFIX_EXTRA}" ]; then - run_cmd_unsplit make \ - ${PKG_MAKEFLAGS_INSTALL} \ - ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ - AR=${AR} CC=${CC} RANLIB=${RANLIB} \ - "${PKG_CFLAGS_INSTALL:+CFLAGS=${PKG_CFLAGS_INSTALL}}" \ - "${PKG_CFLAGS_INSTALL_EXTRA:+CFLAGS+=${PKG_CFLAGS_INSTALL_EXTRA}}" \ - "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ - "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ - "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ - "LIBTOOL=${PKG_SLIBTOOL:-slibtool}" \ - ${PKG_INSTALL_TARGET_EXTRA:=install} \ - DESTDIR=${PKG_PREFIX_EXTRA}; + build_fileop mkdir "${PKG_PREFIX_EXTRA}"; + tar -C ../destdir -cpf - . | tar -C "${PKG_PREFIX_EXTRA}" -xpf -; fi; fi; pkgp_install_clean_lib; diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index eba8f6f2..fadd1ed8 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -5,10 +5,10 @@ pkg_patch() { local _patch_fname _patches_done; set +o noglob; - for _patch_fname in \ - ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ + for _patch_fname in \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_NAME}.midipix.patch \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_SUBDIR}.midipix.patch \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}/*.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ @@ -20,7 +20,7 @@ pkg_patch() { ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch; do if ! lmatch "${_patches_done}" " " "${_patch_fname}"\ && [ -r "${_patch_fname}" ]; then - patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; + patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; _patches_done="${_patches_done:+${_patches_done} }${_patch_fname}"; fi; done; diff --git a/subr/pkg_patch_pre.subr b/subr/pkg_patch_pre.subr index f3402fcd..f6ab9f05 100644 --- a/subr/pkg_patch_pre.subr +++ b/subr/pkg_patch_pre.subr @@ -7,11 +7,10 @@ pkg_patch_pre() { for __ in \ ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local.patch \ ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR}_pre.midipix.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch; do if [ -r "${__}" ]; then - patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${__}"; + patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${__}"; fi; done; }; diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index 43d1160c..8bf076b2 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -12,6 +12,9 @@ pkg_setup_env() { [ -n "${PKG_ENV_VARS_EXTRA}" ] && set_env_vars_with_sep : "${PKG_ENV_VARS_EXTRA}"; [ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}"; [ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}"; + [ -z "${PKG_BASE_DIR}" ] && PKG_BASE_DIR="${WORKDIR}/${PKG_NAME}-${PKG_BUILD_TYPE:-native}-${PKG_TARGET}"; + build_fileop mkdir "${PKG_BASE_DIR}"; + build_fileop cd "${PKG_BASE_DIR}"; case "${PKG_BUILD_TYPE}" in host) export AR="ar"; export CC="gcc"; diff --git a/subr/pkg_work_dir.subr b/subr/pkg_work_dir.subr index 20b9ce17..5d18278c 100644 --- a/subr/pkg_work_dir.subr +++ b/subr/pkg_work_dir.subr @@ -3,10 +3,10 @@ # pkg_work_dir() { - if [ ! -d "${WORKDIR}/${PKG_BUILD_DIR}" ]; then - build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}"; + if [ ! -d "${PKG_BUILD_DIR}" ]; then + build_fileop mkdir "${PKG_BUILD_DIR}"; fi; - build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop cd "${PKG_BUILD_DIR}"; }; # vim:filetype=sh diff --git a/subr/pre_setup_env.subr b/subr/pre_setup_env.subr index 8bef5820..0f22fdbe 100644 --- a/subr/pre_setup_env.subr +++ b/subr/pre_setup_env.subr @@ -4,9 +4,9 @@ pre_setup_env() { local __; - if [ -z "${BUILD_CPUS}" ]\ + if [ -z "${DEFAULT_BUILD_CPUS}" ]\ && [ -e /proc/cpuinfo ]; then - BUILD_CPUS=$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo); + DEFAULT_BUILD_CPUS=$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo); fi; : ${ARCH:=nt64}; : ${BUILD:=debug}; if [ "${ARCH}" = nt32 ]; then @@ -25,9 +25,9 @@ pre_setup_env() { done; export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; if [ ${ARG_IPV4_ONLY:-0} -eq 1 ]; then - WGET_ARGS="-4${WGET_ARGS:+ ${WGET_ARGS}}"; + DEFAULT_WGET_ARGS="-4${DEFAULT_WGET_ARGS:+ ${DEFAULT_WGET_ARGS}}"; elif [ ${ARG_IPV6_ONLY:-0} -eq 1 ]; then - WGET_ARGS="-6${WGET_ARGS:+ ${WGET_ARGS}}"; + DEFAULT_WGET_ARGS="-6${DEFAULT_WGET_ARGS:+ ${DEFAULT_WGET_ARGS}}"; fi; for __ in $(export | sed -e 's/^export //' -e 's/=.*$//'); do if ! lmatch "${CLEAR_ENV_VARS_EXCEPT}" " " "${__}"; then diff --git a/subr/pre_subdirs.subr b/subr/pre_subdirs.subr index bc205032..6d857d8a 100644 --- a/subr/pre_subdirs.subr +++ b/subr/pre_subdirs.subr @@ -16,6 +16,7 @@ pre_subdirs() { /=${DLCACHEDIR} \ /=${WORKDIR} \ /=${PREFIX} \ + /=${PREFIX}/bin \ /=${PREFIX}/${TARGET}/bin \ /=${PREFIX}/${TARGET}/lib \ /=${PREFIX}/x86_64-w64-mingw32 \ diff --git a/vars/build.vars b/vars/build.vars index 4e7cacea..936ef723 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -2,7 +2,7 @@ # Build target invariants # INVARIANTS_PACKAGES="chainport"; -: ${PKG_CHAINPORT_URLS_GIT:="chainport=${GITROOT}/ports/chainport"}; +: ${PKG_CHAINPORT_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"}; : ${PKG_CHAINPORT_BUILD_STEPS_DISABLE:="build:main configure:main install:main"}; # @@ -15,70 +15,78 @@ slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full install_strip_host psxtypes_host ldso_host pkgconf_host"; HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; -: ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${GITROOT}/slibtool"}; +: ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"}; : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=}; -: ${PKG_SLIBTOOL_HOST_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX}}; -: ${PKG_PERK_HOST_URLS_GIT:="perk=${GITROOT}/perk"}; +: ${PKG_SLIBTOOL_HOST_PREFIX:=${PREFIX}}; +: ${PKG_PERK_HOST_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"}; : ${PKG_PERK_HOST_CONFIGURE_ARGS:="--prefix=/usr"}; : ${PKG_PERK_HOST_INSTALL_FILES:="@perk=bin/${TARGET}-perk"}; -: ${PKG_PERK_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"}; : ${PKG_PERK_HOST_PREFIX:=${PREFIX}}; -: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${GITROOT}/mdso"}; +: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"}; : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso bin/mdso=${TARGET}/bin/mdso"}; -: ${PKG_MDSO_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"}; : ${PKG_MDSO_HOST_PREFIX:=${PREFIX}}; : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_HOST_VERSION:=2.24.51}; : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2}; : ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=${TARGET} --with-sysroot=${PREFIX_CROSS}"}; +: ${PKG_BINUTILS_HOST_INSTALL_FILES:="@${TARGET}-windmc=bin/windmc @${TARGET}-windres=bin/windres"}; +: ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="}; +: ${PKG_BINUTILS_HOST_PREFIX=${PREFIX}}; : ${PKG_BINUTILS_HOST_SLIBTOOL:=slibtool-static}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_VERSION:=2.24.51}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_VERSION}.tar.bz2}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=x86_64-w64-mingw32 --with-sysroot=${PREFIX_CROSS}"}; +: ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_SLIBTOOL:=slibtool-static}; : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32}; : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32}; : ${PKG_GCC_STAGE1_VERSION:=4.6.4}; -: ${PKG_PSXSTUB_URLS_GIT:="psxstub=${GITROOT}/psxstub"}; +: ${PKG_GCC_STAGE1_BASE_DIR:=${WORKDIR}}; +: ${PKG_PSXSTUB_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"}; +: ${PKG_PSXSTUB_BUILD_DIR:=psxstub}; : ${PKG_PSXSTUB_BUILD_STEPS_DISABLE:=build:main}; : ${PKG_MUSL_NO_COMPLEX_VERSION:=1.1.12}; +: ${PKG_MUSL_NO_COMPLEX_BASE_DIR:=${WORKDIR}}; : ${PKG_GCC_RUNTIME_VERSION:=4.6.4}; +: ${PKG_GCC_RUNTIME_BASE_DIR:=${WORKDIR}}; : ${PKG_MUSL_FULL_VERSION:=1.1.12}; +: ${PKG_MUSL_FULL_BASE_DIR:=${WORKDIR}}; : ${PKG_GCC_LIBSTDCPP_V3_VERSION:=4.6.4}; +: ${PKG_GCC_LIBSTDCPP_V3_BASE_DIR:=${WORKDIR}}; : ${PKG_GCC_FULL_VERSION:=4.6.4}; +: ${PKG_GCC_FULL_BASE_DIR:=${WORKDIR}}; : ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS_DISABLE:="fetch:main extract:main build:main"}; : ${PKG_INSTALL_STRIP_HOST_URL:=none}; -: ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${GITROOT}/psxtypes}; -: ${PKG_PSXTYPES_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_CROSS}"}; -: ${PKG_PSXTYPES_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_CROSS}"}; -: ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${GITROOT}/pemagine}; +: ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; +: ${PKG_PSXTYPES_HOST_BUILD_STEPS_DISABLE:=build:main}; +: ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine}; : ${PKG_LDSO_HOST_BUILD_TYPE:=cross}; : ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"}; : ${PKG_LDSO_HOST_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET} --disable-shared"}; : ${PKG_LDSO_HOST_INSTALL_FILES:="@../${TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"}; : ${PKG_LDSO_HOST_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a}; -: ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:="DESTDIR=${PREFIX_CROSS} STATIC_LIB_NAME=libldso.a"}; -: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"}; -: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=${PREFIX}}; +: ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f}; : ${PKG_PKGCONF_HOST_VERSION:=0.9.12}; : ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2}; +: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"}; +: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=}; +: ${PKG_PKGCONF_HOST_PREFIX:=${PREFIX}}; # # Build target native_toolchain # NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix=/ --target=${TARGET}"; -NATIVE_TOOLCHAIN_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}/"; NATIVE_TOOLCHAIN_PACKAGES=" slibtool perk pkgconf gmp mpfr mpc libelf binutils binutils_x86_64_w64_mingw32 musl_native gcc_native gcc_stage1_native_x86_64_w64_mingw32 mdso"; NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"}; : ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"}; -: ${PKG_PERK_URLS_GIT:="perk=${GITROOT}/perk"}; +: ${PKG_PERK_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"}; : ${PKG_PERK_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"}; : ${PKG_PERK_INSTALL_FILES:="@perk=bin/${TARGET}-perk"}; : ${PKG_PKGCONF_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f}; @@ -104,26 +112,26 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LIBELF_VERSION:=0.8.13}; : ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz}; : ${PKG_LIBELF_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix=${PREFIX_NATIVE} --target=${TARGET}"}; -: ${PKG_LIBELF_MAKEFLAGS_INSTALL:=}; : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_VERSION:=2.24.51}; : ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2}; : ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"}; -: ${PKG_BINUTILS_INSTALL_FILES:="@${TARGET}-windmc=bin/windmc @${TARGET}-windres=bin/windres"}; : ${PKG_BINUTILS_SLIBTOOL:=slibtool-static}; : ${PKG_BINUTILS_X86_64_W64_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_X86_64_W64_MINGW32_VERSION:=2.24.51}; : ${PKG_BINUTILS_X86_64_W64_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_X86_64_W64_MINGW32_VERSION}.tar.bz2}; : ${PKG_BINUTILS_X86_64_W64_MINGW32_CONFIGURE_ARGS:="--disable-nls --enable-deterministic-archives --host=${TARGET} --prefix=/ --target=x86_64-w64-mingw32 --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"}; : ${PKG_BINUTILS_X86_64_W64_MINGW32_SLIBTOOL:=slibtool-static}; -: ${PKG_BINUTILS_X86_64_W64_MINGW32_BUILD_DIR:=binutils-${PKG_BINUTILS_X86_64_W64_MINGW32_VERSION}-native-x86_64-nt64-midipix-x86_64-w64-mingw32}; : ${PKG_MUSL_NATIVE_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e}; : ${PKG_MUSL_NATIVE_VERSION:=1.1.12}; : ${PKG_MUSL_NATIVE_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_NATIVE_VERSION}.tar.gz}; +: ${PKG_MUSL_NATIVE_BASE_DIR:=${WORKDIR}}; : ${PKG_GCC_NATIVE_VERSION:=4.6.4}; +: ${PKG_GCC_NATIVE_BASE_DIR:=${WORKDIR}}; : ${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32}; -: ${PKG_MDSO_URLS_GIT:="mdso=${GITROOT}/mdso"}; +: ${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_BASE_DIR:=${WORKDIR}}; +: ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"}; : ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso @../../bin/mdso=${TARGET}/bin/mdso"}; @@ -131,68 +139,69 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; # Build target runtime # RUNTIME_BUILD_TYPE="native"; -RUNTIME_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT_RUNTIME}"; +RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}"; RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${TARGET}"; RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"; -RUNTIME_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}/"; RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ptycon u16ports"; RUNTIME_PREFIX="${PREFIX_NATIVE}"; -: ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${GITROOT}/psxtypes}; +: ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; -: ${PKG_PEMAGINE_URLS_GIT:=pemagine=${GITROOT}/pemagine}; +: ${PKG_PEMAGINE_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine}; : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PEMAGINE_INSTALL_TARGET_EXTRA:=install-lib}; -: ${PKG_DALIST_URLS_GIT:=dalist=${GITROOT}/dalist}; +: ${PKG_DALIST_URLS_GIT:=dalist=${DEFAULT_GITROOT}/dalist}; : ${PKG_DALIST_INSTALL_TARGET_EXTRA:=install-lib}; -: ${PKG_LDSO_URLS_GIT:=pemagine=${GITROOT}/pemagine}; +: ${PKG_LDSO_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine}; : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"}; : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared}; : ${PKG_LDSO_INSTALL_FILES:="@../../lib/libldso.a=${TARGET}/lib/libldso.a"}; : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a}; -: ${PKG_NTCON_URLS_GIT:=ntcon=${GITROOT}/ntcon}; +: ${PKG_NTCON_URLS_GIT:=ntcon=${DEFAULT_GITROOT}/ntcon}; : ${PKG_NTCON_INSTALL_TARGET_EXTRA:=install-lib}; -: ${PKG_NTAPI_URLS_GIT:=ntapi=${GITROOT}/ntapi}; +: ${PKG_NTAPI_URLS_GIT:=ntapi=${DEFAULT_GITROOT}/ntapi}; : ${PKG_NTAPI_INSTALL_TARGET_EXTRA:=install-lib}; -: ${PKG_PSXSCL_URLS_GIT:=psxscl=${GITROOT_HEAD}/psxscl}; +: ${PKG_PSXSCL_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PSXSCL_INSTALL_TARGET_EXTRA:=install-lib}; -: ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${GITROOT_HEAD}/psxscl}; +: ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_INTERNAL_STRACE -O0"}; : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/psxscl_strace lib/libpsxscl.so=lib/psxscl_strace/"}; : ${PKG_PSXSCL_STRACE_NO_INSTALL_LIBS:=1}; : ${PKG_PSXSCL_STRACE_NO_MAKE_INSTALL:=1}; -: ${PKG_NTCTTY_URLS_GIT:=ntctty=${GITROOT_HEAD}/ntctty}; +: ${PKG_NTCTTY_URLS_GIT:=ntctty=${DEFAULT_GITROOT_HEAD}/ntctty}; : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0}; -: ${PKG_PTYCON_URLS_GIT:=ptycon=${GITROOT_HEAD}/ptycon}; +: ${PKG_PTYCON_URLS_GIT:=ptycon=${DEFAULT_GITROOT_HEAD}/ptycon}; : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"}; : ${PKG_U16PORTS_CFLAGS_CONFIGURE_EXTRA:=-Wno-error=missing-field-initializers}; -: ${PKG_U16PORTS_URLS_GIT:=u16ports=${GITROOT_HEAD}/u16ports}; +: ${PKG_U16PORTS_URLS_GIT:=u16ports=${DEFAULT_GITROOT_HEAD}/u16ports}; : ${PKG_U16PORTS_INSTALL_TARGET_EXTRA:=install-lib}; # # Build target host_packages # HOST_PACKAGES_BUILD_TYPE="host"; -HOST_PACKAGES_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT_HOST}"; +HOST_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST}"; HOST_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --prefix=${PREFIX} --program-prefix="; HOST_PACKAGES_LDFLAGS_CONFIGURE=""; -HOST_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX}/ PREFIX= prefix="; +HOST_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; HOST_PACKAGES_PACKAGES=" cmake_host llvm_host clang_host file_host libffi_host glib_host infounzip_host infozip_host intltool_host ruby_host"; +HOST_PACKAGES_PREFIX="${PREFIX}"; : ${PKG_CMAKE_HOST_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe}; : ${PKG_CMAKE_HOST_VERSION:=3.6.3}; : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz}; -: ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${BUILD_CPUS} --prefix=${PREFIX}"}; -: ${PKG_CMAKE_HOST_MAKEFLAGS_INSTALL:="DESTDIR="}; +: ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix=${PREFIX}"}; : ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9}; : ${PKG_LLVM_HOST_VERSION:=3.8.1}; : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz}; +: ${PKG_LLVM_HOST_DISABLED:=1}; : ${PKG_CLANG_HOST_SHA256SUM:=4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf}; : ${PKG_CLANG_HOST_VERSION:=3.8.1}; : ${PKG_CLANG_HOST_URL:=http://releases.llvm.org/${PKG_CLANG_HOST_VERSION}/cfe-${PKG_CLANG_HOST_VERSION}.src.tar.xz}; +: ${PKG_CLANG_HOST_DISABLED:=1}; : ${PKG_FILE_HOST_SHA256SUM:=8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50}; : ${PKG_FILE_HOST_VERSION:=5.32}; : ${PKG_FILE_HOST_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; @@ -202,10 +211,11 @@ infounzip_host infozip_host intltool_host ruby_host"; : ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a}; : ${PKG_GLIB_HOST_VERSION:=2.54.0}; : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz}; +: ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=patch:main}; : ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"}; : ${PKG_GLIB_HOST_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib64 -lffi}; : ${PKG_GLIB_HOST_MAKEFLAGS_BUILD_EXTRA:=-j1}; -: ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=patch:main}; +: ${PKG_GLIB_HOST_DISABLED:=1}; : ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master}; : ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master}; : ${PKG_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd}; @@ -217,15 +227,14 @@ infounzip_host infozip_host intltool_host ruby_host"; : ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=patch:main}; : ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1"}; : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle"}; -: ${PKG_RUBY_HOST_MAKEFLAGS_INSTALL="DESTDIR="}; # # Build target lib_packages # -LIB_PACKAGES_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT:+${CFLAGS_DEFAULT} }--sysroot=${PREFIX_NATIVE}"; +LIB_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --program-prefix= --target=${TARGET}"; LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}/ PREFIX= prefix="; +LIB_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; LIB_PACKAGES_PACKAGES_LEAVES=" expat libxml2 alsa_lib apr apr_util bzip2 curl libz lmdb libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive libatomic_ops @@ -256,15 +265,15 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b}; : ${PKG_APR_UTIL_VERSION:=1.6.1}; : ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2}; -: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${WORKDIR}/apr-${PKG_APR_VERSION}-native-${TARGET}"}; -: ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${PKG_TARGET}-apu-1-config}; +: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${WORKDIR}/apr-native-${TARGET}/obj"}; +: ${PKG_APR_UTIL_INSTALL_FILES:=apu-1-config=${PREFIX}/bin/${TARGET}-apu-1-config}; : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd}; : ${PKG_BZIP2_VERSION:=1.0.6}; : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz}; : ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}}; : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless libbz2.so.1.0=lib/ libbz2.so.1.0.6=lib/"}; : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so}; -: ${PKG_BZIP2_MAKEFLAGS_INSTALL:="PREFIX=${PREFIX_NATIVE}"}; +: ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX}; : ${PKG_BZIP2_NO_CLEAN:=1}; : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde}; : ${PKG_CURL_VERSION:=7.51.0}; @@ -345,12 +354,11 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LIBASSUAN_SHA256SUM:=22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71}; : ${PKG_LIBASSUAN_VERSION:=2.4.3}; : ${PKG_LIBASSUAN_URL:=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_LIBASSUAN_VERSION}.tar.bz2}; -: ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${GITROOT}/compilers/bfirm@main"}; +: ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${DEFAULT_GITROOT}/compilers/bfirm@main"}; +: ${PKG_LIBFIRM_BASE_DIR:=${WORKDIR}}; : ${PKG_LIBFIRM_BUILD_DIR:=cparser+libfirm/build/libfirm}; : ${PKG_LIBFIRM_CONFIGURE:=bfirm/configure}; : ${PKG_LIBFIRM_CONFIGURE_ARGS:="--source-dir=../../../libfirm --prefix="}; -: ${PKG_LIBFIRM_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot}; -: ${PKG_LIBFIRM_PREFIX_EXTRA:=${PREFIX_NATIVE}}; : ${PKG_LIBGCRYPT_SHA256SUM:=3b67862e2f4711e25c4ce3cc4b48d52a58a3afdcd1d8c6a57f93a1c0ef03e5c6}; : ${PKG_LIBGCRYPT_VERSION:=1.7.4}; : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2}; @@ -362,22 +370,19 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LUA_SHA256SUM:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2}; : ${PKG_LUA_VERSION:=5.3.3}; : ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz}; +: ${PKG_LUA_MAKE_INSTALL_VNAME:=INSTALL_TOP}; : ${PKG_LUA_MAKEFLAGS_BUILD_EXTRA:="CC=${TARGET}-gcc midipix"}; -: ${PKG_LUA_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_TOP=${PREFIX_NATIVE}}; : ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; : ${PKG_NCURSES_VERSION:=6.0}; : ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz}; -: ${PKG_NCURSES_BUILD_DIR:=ncurses-${PKG_NCURSES_VERSION}-native-${TARGET}}; : ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --without-manpages --without-progs --without-tests --disable-widec --without-pthread"}; : ${PKG_NCURSESTW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; : ${PKG_NCURSESTW_VERSION:=6.0}; : ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz}; -: ${PKG_NCURSESTW_BUILD_DIR:=ncursestw-${PKG_NCURSESTW_VERSION}-native-${TARGET}}; : ${PKG_NCURSESTW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --without-manpages --without-progs --without-tests --disable-widec --with-pthread"}; : ${PKG_NCURSESW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; : ${PKG_NCURSESW_VERSION:=6.0}; : ${PKG_NCURSESW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_VERSION}.tar.gz}; -: ${PKG_NCURSESW_BUILD_DIR:=ncursesw-${PKG_NCURSESW_VERSION}-native-${TARGET}}; : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --without-ada --with-manpages --with-progs --without-tests --enable-widec --without-pthread"}; : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h}; : ${PKG_NPTH_SHA256SUM:=bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a}; @@ -391,6 +396,7 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_SHARED_MIME_INFO_URL:=http://freedesktop.org/~hadess/shared-mime-info-${PKG_SHARED_MIME_INFO_VERSION}.tar.xz}; : ${PKG_SHARED_MIME_INFO_CONFIGURE_ARGS_EXTRA:=--disable-update-mimedb}; : ${PKG_SHARED_MIME_INFO_MAKEFLAGS_BUILD:=-j1}; +: ${PKG_SHARED_MIME_INFO_DISABLED:=1}; : ${PKG_SQLITE3_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615}; : ${PKG_SQLITE3_VERSION:=3160200}; : ${PKG_SQLITE3_URL:=https://sqlite.org/2017/sqlite-autoconf-${PKG_SQLITE3_VERSION}.tar.gz}; @@ -407,7 +413,7 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_CMAKE_VERSION:=3.6.3}; : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz}; : ${PKG_CMAKE_CFLAGS_CONFIGURE_EXTRA:="-g0 -O2"}; -: ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${BUILD_CPUS} --prefix="}; +: ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix="}; : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d}; : ${PKG_INPUTPROTO_VERSION:=2.3.2}; @@ -502,6 +508,7 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz}; : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c}; : ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_CAIRO_DISABLED:=1}; : ${PKG_DBUS_VERSION:=1.11.20}; : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz}; : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa}; @@ -510,16 +517,20 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e}; : ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz}; : ${PKG_PANGO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_PANGO_DISABLED:=1}; : ${PKG_ATK_VERSION:=2.26.0}; : ${PKG_ATK_SHA256SUM:=eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827}; : ${PKG_ATK_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/${PKG_ATK_VERSION%.*}/atk-${PKG_ATK_VERSION}.tar.xz}; +: ${PKG_ATK_DISABLED:=1}; : ${PKG_GDK_VERSION:=2.36.10}; : ${PKG_GDK_SHA256SUM:=f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace}; : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz}; +: ${PKG_GDK_DISABLED:=1}; : ${PKG_GTK2_SHA256SUM:=68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658}; : ${PKG_GTK2_VERSION:=2.24.31}; : ${PKG_GTK2_URL:=http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_GTK2_VERSION%.*}/gtk+-${PKG_GTK2_VERSION}.tar.xz}; : ${PKG_GTK2_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/pango-1.0 -I${PREFIX_NATIVE}/include/gdk-pixbuf-2.0 -I${PREFIX_NATIVE}/include/atk-1.0 -I${PREFIX_NATIVE}/include/cairo -I${PREFIX_NATIVE}/include/glib-2.0 -I${PREFIX_NATIVE}/include/glib-2.0/gio -I${PREFIX_NATIVE}/lib/glib-2.0/include"}; +: ${PKG_GTK2_DISABLED:=1}; : ${PKG_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272}; : ${PKG_IMLIB2_VERSION:=1.4.10}; : ${PKG_IMLIB2_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/imlib2/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2}; @@ -532,7 +543,7 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; # # Build target dev_packages # -DEV_PACKAGES_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT:+${CFLAGS_DEFAULT} }--sysroot=${PREFIX_NATIVE}"; +DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; DEV_PACKAGES_CONFIGURE_ARGS="${LIB_PACKAGES_CONFIGURE_ARGS}"; DEV_PACKAGES_LDFLAGS_CONFIGURE="${LIB_PACKAGES_LDFLAGS_CONFIGURE}"; DEV_PACKAGES_MAKEFLAGS_INSTALL="${LIB_PACKAGES_MAKEFLAGS_INSTALL}"; @@ -544,10 +555,10 @@ DEV_PACKAGES_PREFIX="${LIB_PACKAGES_PREFIX}"; # # Build target leaf_packages # -LEAF_PACKAGES_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT:+${CFLAGS_DEFAULT} }--sysroot=${PREFIX_NATIVE}"; +LEAF_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; LEAF_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}"; LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}/ PREFIX= prefix="; +LEAF_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; LEAF_PACKAGES_PACKAGES=" apk_tools aria2 bash bc bdwgc bind bison chicken coreutils cparser cron dash datamash diffutils dos2unix dropbear ed figlet file findutils gawk git gnupg @@ -587,17 +598,17 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_CHICKEN_MAKEFLAGS_BUILD:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET}"}; : ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_DEBUG:=DEBUGBUILD=1}; : ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_RELEASE:=DEBUGBUILD=0}; -: ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"}; +: ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=TARGET_PREFIX}; +: ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"}; : ${PKG_CHICKEN_NO_CLEAN:=1}; : ${PKG_COREUTILS_SHA256SUM:=1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65}; : ${PKG_COREUTILS_VERSION:=8.28}; : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz}; -: ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${GITROOT}/compilers/bcparser@main"}; +: ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${DEFAULT_GITROOT}/compilers/bcparser@main"}; +: ${PKG_CPARSER_BASE_DIR:=${WORKDIR}}; : ${PKG_CPARSER_BUILD_DIR:=cparser+libfirm/build/cparser}; : ${PKG_CPARSER_CONFIGURE:=bcparser/configure}; : ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../../cparser --prefix="}; -: ${PKG_CPARSER_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot}; -: ${PKG_CPARSER_PREFIX_EXTRA:=${PREFIX_NATIVE}}; : ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"}; : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"}; : ${PKG_DASH_SHA256SUM:=5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659}; @@ -671,6 +682,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_IRSSI_VERSION:=1.0.4}; : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz}; : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}}; +: ${PKG_IRSSI_DISABLED:=1}; : ${PKG_JOHN_SHA256SUM:=952cf68369fb5b27f2d112ce7ca1eb16b975c85cbce8c658abb8bc5a20e1b266}; : ${PKG_JOHN_VERSION:=1.8.0}; : ${PKG_JOHN_URL:=http://www.openwall.com/john/j/john-${PKG_JOHN_VERSION}.tar.xz}; @@ -698,6 +710,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LUNIX_URLS_GIT:=lunix=https://github.com/Redfoxmoon3/lunix.git@master}; : ${PKG_LUNIX_BUILD_DIR:=lunix}; : ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3"}; +: ${PKG_LUNIX_MAKEFLAGS_INSTALL_EXTRA:=libdir=lib}; : ${PKG_LUNIX_ENV_VARS_EXTRA:="libdir=${PREFIX_NATIVE}/lib"}; : ${PKG_LYNX_SHA256SUM:=6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7}; : ${PKG_LYNX_VERSION:=2.8.8rel.2}; @@ -717,6 +730,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz}; : ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"}; : ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"}; +: ${PKG_MC_DISABLED:=1}; : ${PKG_MINGW_W64_SHA256SUM:=9bb5cd7df78817377841a63555e73596dc0af4acbb71b09bd48de7cf24aeadd2}; : ${PKG_MINGW_W64_VERSION:=5.0.1}; : ${PKG_MINGW_W64_URL:=https://sourceforge.mirrorservice.org/m/mi/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PKG_MINGW_W64_VERSION}.tar.bz2}; @@ -731,6 +745,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382}; : ${PKG_MTR_VERSION:=0.92}; : ${PKG_MTR_URL:=ftp://ftp.bitwizard.nl/mtr/mtr-${PKG_MTR_VERSION}.tar.gz}; +: ${PKG_MTR_DISABLED:=1}; : ${PKG_M4_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07}; : ${PKG_M4_VERSION:=1.4.18}; : ${PKG_M4_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_VERSION}.tar.xz}; @@ -752,7 +767,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_OPENLITESPEED_CONFIGURE_ARGS:="-C --host=${TARGET} --prefix=/usr/lsws --target=${TARGET} --with-expat=${PREFIX_NATIVE} --with-openssl=${PREFIX_NATIVE} --with-zlib=${PREFIX_NATIVE}" --enable-spdy=no}; : ${PKG_OPENLITESPEED_CXXFLAGS_CONFIGURE_EXTRA:="-D_GNU_SOURCE"}; : ${PKG_OPENLITESPEED_MAKEFLAGS_BUILD:=-j1}; -: ${PKG_OPENLITESPEED_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX_NATIVE}/lsws}}; +: ${PKG_OPENLITESPEED_PREFIX:=${PREFIX_NATIVE}/lsws}; : ${PKG_OPENSSH_SHA256SUM:=3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc}; : ${PKG_OPENSSH_VERSION:=7.3p1}; : ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz}; @@ -775,10 +790,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PERL_VERSION:=5.22.1}; : ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz}; : ${PKG_PERL_URLS_GIT:="perl-cross=https://github.com/lalbornoz/perl-cross@master"}; -: ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}}; +: ${PKG_PERL_BASE_DIR:=${WORKDIR}}; : ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include --sysroot=${PREFIX_NATIVE} --target=${TARGET}"}; : ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${TARGET}"}; : ${PKG_PERL_MAKEFLAGS_BUILD:=-j1}; +: ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}}; : ${PKG_PROCPS_NG_SHA256SUM:=b1036c109f271c7c50325b11a748236f8e58aa1dbafefb30c995ff1d05b4a1a8}; : ${PKG_PROCPS_NG_VERSION:=3.3.12}; : ${PKG_PROCPS_NG_URL:=https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v${PKG_PROCPS_NG_VERSION}}; @@ -809,7 +825,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2}; : ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp}; : ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"}; -: ${PKG_SBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="}; +: ${PKG_SBASE_MAKE_INSTALL_VNAME:=PREFIX}; +: ${PKG_SBASE_PREFIX:=${PREFIX_NATIVE}/suckless}; : ${PKG_SED_SHA256SUM:=cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b}; : ${PKG_SED_VERSION:=4.4}; : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz}; @@ -840,15 +857,16 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_THTTPD_VERSION:=2.27}; : ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz}; : ${PKG_THTTPD_BUILD_DIR:=thttpd-${PKG_THTTPD_VERSION}}; -: ${PKG_THTTPD_MAKEFLAGS_INSTALL:="prefix=${PREFIX_NATIVE}"}; : ${PKG_THTTPD_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix= --target=${TARGET}"}; +: ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix}; : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b}; : ${PKG_TMUX_VERSION:=2.3}; : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz}; : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master}; : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}:CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"}; : ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"}; -: ${PKG_UBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="}; +: ${PKG_UBASE_MAKE_INSTALL_VNAME:=PREFIX}; +: ${PKG_UBASE_PREFIX:=${PREFIX_NATIVE}/suckless}; : ${PKG_UTIL_LINUX_SHA256SUM:=d5950e4b2839d00aa3781f439bfada8091bc6ed8180d8262c53b4e4304e2d299}; : ${PKG_UTIL_LINUX_VERSION:=2.31}; : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; @@ -882,7 +900,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WHOIS_VERSION:=5.2.18}; : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz}; : ${PKG_WHOIS_ENV_VARS_EXTRA:=PKG_CONFIG=${TARGET}-pkg-config}; -: ${PKG_WHOIS_MAKEFLAGS_INSTALL:=BASEDIR=${PREFIX_NATIVE}}; +: ${PKG_WHOIS_MAKE_INSTALL_VNAME:=BASEDIR}; : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}}; : ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521}; : ${PKG_XEYES_VERSION:=1.1.1}; @@ -897,10 +915,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; # # Build target minipix # -MINIPIX_CFLAGS_CONFIGURE="${CFLAGS_DEFAULT:+${CFLAGS_DEFAULT} }--sysroot=${PREFIX_NATIVE}"; +MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}"; MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -MINIPIX_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_MINIPIX}/ PREFIX= prefix="; +MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; MINIPIX_PACKAGES=" ntctty_flavour_minipix ptycon_flavour_minipix gzip_flavour_minipix bzip2_flavour_minipix xz_flavour_minipix @@ -933,7 +951,7 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}"; : ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${TARGET}-install-strip}; : ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"}; : ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; -: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX}"}; +: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"}; # # Build meta-targets diff --git a/vars/check_updates.vars b/vars/check_updates.vars index 8c923b75..91d3b01b 100644 --- a/vars/check_updates.vars +++ b/vars/check_updates.vars @@ -9,7 +9,7 @@ pkg_apk_tools_check_updates() { cu_fname_base="apk-tools"; cu_fname_ext="${cu_fname#${cu_fname_base}-${cu_version}.}"; cu_url_index="http://git.alpinelinux.org/cgit/apk-tools/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '//s/^.*The current version is 1.0.6<\/b>/s/^.*

The current version is \(.\+\)<\/b>.*$/bzip2-\1/p')"; ;; get_version) @@ -38,7 +38,7 @@ pkg_infounzip_check_updates() { cu_fname_base="${cu_fname%%[0-9]*}"; cu_fname_ext="${cu_fname#${cu_fname_base}${cu_version}.}"; cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '/[hH][rR][eE][fF]="[^"]\+"/s/^.*[hH][rR][eE][fF]="\([^"]\+\)".*$/\1/p' |\ grep -Ev '/(zip232|unzip552)\..+$')"; ;; @@ -60,7 +60,7 @@ pkg_john_check_updates() { case "${1}" in get_fnames) cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '/[hH][rR][eE][fF]="[^"]\+"/s/^.*[hH][rR][eE][fF]="\([^"]\+\)".*$/\1/p' |\ grep -Ev 'john-.+-jumbo-.+\.')"; ;; @@ -71,7 +71,7 @@ pkg_less_check_updates() { case "${1}" in get_fnames) cu_url_index="http://www.greenwoodsoftware.com/less/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '/The current released version is less-[0-9]\+/s/^.*The current released version is less-\([0-9]\+\).*$/less-\1/p')"; ;; get_version) @@ -84,7 +84,7 @@ pkg_libgpg_error_check_updates() { case "${1}" in get_fnames) cu_url_index="${cu_url%/*}/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '/href="[^"]\+"/s/^.*href="\([^"]\+\)".*$/\1/p')"; cu_fname_base="libgpg-error"; ;; @@ -150,7 +150,7 @@ pkg_pacman_check_updates() { cu_fname_base="pacman"; cu_fname_ext="${cu_fname#${cu_fname_base}-${cu_version}.}"; cu_url_index="https://git.archlinux.org/pacman.git/"; - cu_fnames="$(wget ${WGET_ARGS} -qO- "${cu_url_index}" |\ + cu_fnames="$(wget ${DEFAULT_WGET_ARGS} -qO- "${cu_url_index}" |\ sed -n '//s/^.*