diff options
| author | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-13 10:30:01 +0100 |
|---|---|---|
| committer | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-13 10:30:01 +0100 |
| commit | 1f04ef7650b8f324f551d690035f8674b02d5582 (patch) | |
| tree | 583185ce2453793aa671729891567eaa0f7939cc | |
| parent | a70971df269cd4537e4247a41d1780d0360d40c8 (diff) | |
| download | midipix_build-1f04ef7650b8f324f551d690035f8674b02d5582.tar.bz2 midipix_build-1f04ef7650b8f324f551d690035f8674b02d5582.tar.xz | |
Followup to <fd38dc025f5d31890abbf3d48c597114203b1421>.
| -rw-r--r-- | subr.pkg/pkg_configure_patch.subr | 9 | ||||
| -rw-r--r-- | subr.pkg/pkg_configure_patch_pre.subr | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/subr.pkg/pkg_configure_patch.subr b/subr.pkg/pkg_configure_patch.subr index 8ed0ad33..07fb644d 100644 --- a/subr.pkg/pkg_configure_patch.subr +++ b/subr.pkg/pkg_configure_patch.subr @@ -7,8 +7,7 @@ pkg_configure_patch() { local _pcp_group_name="${1}" _pcp_pkg_name="${2}" _pcp_restart_at="${3}" \ _pcp_patch_cwd="" _pcp_patch_dir="${MIDIPIX_BUILD_PWD}/patches" \ _pcp_patch_fname="" _pcp_patch_idx=0 _pcp_patches_done="" \ - _pcp_pkg_name_full="" _pcp_strip_count=0; - _pcp_pkg_name_full="${_pcp_pkg_name}${PKG_VERSION:+-${PKG_VERSION}}"; + _pcp_strip_count=0; if [ "${PKG_FNAME:+1}" = 1 ]\ && [ "${PKG_URLS_GIT:+1}" = 1 ]; @@ -21,9 +20,9 @@ pkg_configure_patch() { fi; _pcp_patch_idx=1; - while ex_pkg_get_default \ - \$_pcp_patch_fname "${_pcp_pkg_name}" \ - "${PKG_VERSION}" "patches" "${_pcp_patch_idx}" \ + while ex_pkg_get_default \ + \$_pcp_patch_fname "${_pcp_pkg_name}" \ + "${PKG_VERSION:-}" "patches" "${_pcp_patch_idx}" \ && [ "${_pcp_patch_fname:+1}" = 1 ]; do : $((_pcp_patch_idx += 1)); diff --git a/subr.pkg/pkg_configure_patch_pre.subr b/subr.pkg/pkg_configure_patch_pre.subr index d315fb49..5f3c8fff 100644 --- a/subr.pkg/pkg_configure_patch_pre.subr +++ b/subr.pkg/pkg_configure_patch_pre.subr @@ -9,7 +9,7 @@ pkgp_configure_patch_pre() { _ppcpp_patch_idx=1; while ex_pkg_get_default \ \$_ppcpp_patch_fname "${PKG_NAME}" \ - "${PKG_VERSION}" "patches_pre" "${_ppcpp_patch_idx}" \ + "${PKG_VERSION:-}" "patches_pre" "${_ppcpp_patch_idx}" \ && [ "${_pcp_patch_fname:+1}" = 1 ]; do : $((_ppcpp_patch_idx += 1)); @@ -25,9 +25,9 @@ pkgp_configure_patch_pre() { pkgp_configure_patch_pre_chainport() { local _ppcppc_patch_dname="" _ppcppc_patch_fname=""; - ex_pkg_get_default \ - \$_ppcppc_patch_fname "${PKG_NAME}" \ - "${PKG_VERSION}" "patches_chainport" 1 \ + ex_pkg_get_default \ + \$_ppcppc_patch_fname "${PKG_NAME}" \ + "${PKG_VERSION:-}" "patches_chainport" 1 \ || return 1; if [ "${_ppcppc_patch_fname:+1}" = 1 ]\ |