diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-24 15:03:45 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-24 15:03:45 +0000 |
| commit | ff26b59b781e540b8c3ec7606408aac1493a2580 (patch) | |
| tree | 5eb684bd41507d0dc7a78c3459d5accc3faaaf57 /vars | |
| parent | c27c8684a6c5787db8d501e9a85c79b2fb3142ab (diff) | |
| download | midipix_build-ff26b59b781e540b8c3ec7606408aac1493a2580.tar.bz2 midipix_build-ff26b59b781e540b8c3ec7606408aac1493a2580.tar.xz | |
patches/musl/musl-{0001-fopencookie,0002-fopencookie+abi-compat}.patch: added from upstream (via Redfoxmoon.)
vars/musl.vars:pkg_musl_{{no_complex,full}_host,full}_all(): apply all patches in ${MIDIPIX_BUILD_PWD}/patches/musl/ after extracting and prior to configuring.
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/musl.vars | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/vars/musl.vars b/vars/musl.vars index 9f8473d1..77c3603b 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -46,7 +46,16 @@ pkg_musl_no_complex_host_all() { set +o noglob; ex_rtl_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_VERSION}/"; set -o noglob; - ex_pkg_state_set "${PKG_NAME}" extract -configure; + ex_pkg_state_set "${PKG_NAME}" extract -patch; + fi; + if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then + set +o noglob; for _patch_fname in \ + "${MIDIPIX_BUILD_PWD}/patches/musl/"*.patch; do + if [ -r "${_patch_fname}" ]; then + patch -b -d "${PKG_BASE_DIR}/musl-${PKG_VERSION}" -p1 < "${_patch_fname}"; + fi; + done; set -o noglob; + ex_pkg_state_set "${PKG_NAME}" patch -configure; fi; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then pkgp_musl_configure; @@ -90,7 +99,16 @@ pkg_musl_full_host_all() { set +o noglob; ex_rtl_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_VERSION}/"; set -o noglob; - ex_pkg_state_set "${PKG_NAME}" extract -configure; + ex_pkg_state_set "${PKG_NAME}" extract -patch; + fi; + if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then + set +o noglob; for _patch_fname in \ + "${MIDIPIX_BUILD_PWD}/patches/musl/"*.patch; do + if [ -r "${_patch_fname}" ]; then + patch -b -d "${PKG_BASE_DIR}/musl-${PKG_VERSION}" -p1 < "${_patch_fname}"; + fi; + done; set -o noglob; + ex_pkg_state_set "${PKG_NAME}" patch -configure; fi; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then pkgp_musl_configure; @@ -134,7 +152,16 @@ pkg_musl_full_all() { set +o noglob; ex_rtl_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_VERSION}/"; set -o noglob; - ex_pkg_state_set "${PKG_NAME}" extract -configure; + ex_pkg_state_set "${PKG_NAME}" extract -patch; + fi; + if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then + set +o noglob; for _patch_fname in \ + "${MIDIPIX_BUILD_PWD}/patches/musl/"*.patch; do + if [ -r "${_patch_fname}" ]; then + patch -b -d "${PKG_BASE_DIR}/musl-${PKG_VERSION}" -p1 < "${_patch_fname}"; + fi; + done; set -o noglob; + ex_pkg_state_set "${PKG_NAME}" patch -configure; fi; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then pkgp_musl_configure; |