diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-03 02:35:33 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-03 02:35:33 +0000 |
| commit | 5b02e1597a0c3aa9c6c6d385acea34de6e37fadf (patch) | |
| tree | eb4943c4d3bf8e07e6a390a0f6f60af9619dfd18 /subr | |
| parent | 2bee8fe23a437439923f35cde08e62a1096426d3 (diff) | |
| download | midipix_build-5b02e1597a0c3aa9c6c6d385acea34de6e37fadf.tar.bz2 midipix_build-5b02e1597a0c3aa9c6c6d385acea34de6e37fadf.tar.xz | |
vars/build.vars, patches/httpd-2.4.25.local.patch: preliminarily adds httpd v2.4.25 (via Redfoxmoon) (not built by default.)
build.sh, subr/{pkg_{build_dir,distclean,setup},rtl}.subr: adds `distclean' build step between setup and configure.
vars/apr{,_util}.vars: provide ${PREFIX}/bin/${PKG_TARGET}-ap[ru]-1-config to facilitate building Apache.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_build_dir.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_distclean.subr | 14 | ||||
| -rw-r--r-- | subr/pkg_setup.subr | 2 | ||||
| -rw-r--r-- | subr/rtl.subr | 3 |
4 files changed, 17 insertions, 5 deletions
diff --git a/subr/pkg_build_dir.subr b/subr/pkg_build_dir.subr index 1e46323e..86ead38b 100644 --- a/subr/pkg_build_dir.subr +++ b/subr/pkg_build_dir.subr @@ -7,9 +7,6 @@ pkg_build_dir() { if [ -z "${PKG_BUILD_DIR}" ]; then set_build_dir ${PKG_SUBDIR} ${PKG_BUILD_TYPE:-native}; fi; - [ "${PKG_SUBDIR}" != "${PKG_BUILD_DIR}" ] &&\ - secure_rm ${PKG_BUILD_DIR}; - insecure_mkdir ${PKG_BUILD_DIR}; set_build_script_done build_dir -patch_pre; }; diff --git a/subr/pkg_distclean.subr b/subr/pkg_distclean.subr new file mode 100644 index 00000000..aae22162 --- /dev/null +++ b/subr/pkg_distclean.subr @@ -0,0 +1,14 @@ +# +# . ./build.vars and set -o errexit -o noglob are assumed. +# See warning at the top of build.vars. +# + +pkg_distclean() { + if [ "${PKG_SUBDIR}" != "${PKG_BUILD_DIR}" ]; then + secure_rm ${PKG_BUILD_DIR}; + insecure_mkdir ${PKG_BUILD_DIR}; + fi; + set_build_script_done distclean -configure; +}; + +# vim:filetype=sh diff --git a/subr/pkg_setup.subr b/subr/pkg_setup.subr index 242541ad..c9a78a49 100644 --- a/subr/pkg_setup.subr +++ b/subr/pkg_setup.subr @@ -27,7 +27,7 @@ pkg_setup() { else __no_autoconf=1; fi; - set_build_script_done setup -configure; + set_build_script_done setup distclean -configure; }; # vim:filetype=sh diff --git a/subr/rtl.subr b/subr/rtl.subr index 70fcbe32..be3efa43 100644 --- a/subr/rtl.subr +++ b/subr/rtl.subr @@ -104,7 +104,8 @@ secure_rm() { is_build_script_done() { - if [ "${1}" = "clean" ]; then + if [ "${1}" = "clean" ]\ + || [ "${1}" = distclean ]; then if match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC} \ && [ -n "${ARG_RESTART_AT}" ] \ && match_list "${ARG_RESTART_AT}" , "${1}"; then |