diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 22:26:13 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 22:26:13 +0000 |
| commit | aa37e639c68ce3724c5c71773b6399cf02ba8379 (patch) | |
| tree | ac1d2162bcd26976efd0b9bdd4b5628086ab71e5 | |
| parent | 1c6c043f9bf40ce026c03d8bdc1fe8f42c52d9c5 (diff) | |
| download | midipix_build-aa37e639c68ce3724c5c71773b6399cf02ba8379.tar.bz2 midipix_build-aa37e639c68ce3724c5c71773b6399cf02ba8379.tar.xz | |
subr/pkg_{fetch_extract,install_make}.subr, vars/env.vars: minor cleanup.
| -rw-r--r-- | subr/pkg_fetch_extract.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_install_make.subr | 4 | ||||
| -rw-r--r-- | vars/env.vars | 26 |
3 files changed, 15 insertions, 18 deletions
diff --git a/subr/pkg_fetch_extract.subr b/subr/pkg_fetch_extract.subr index 9df9f93e..8802a950 100644 --- a/subr/pkg_fetch_extract.subr +++ b/subr/pkg_fetch_extract.subr @@ -12,8 +12,7 @@ pkgp_fetch_extract_type() { }; pkg_fetch_extract() { - if [ -n "${PKG_URL}" ]\ - && [ "${PKG_URL_TYPE:-wget}" = wget ]; then + if [ -n "${PKG_URL}" ]; then _oldpwd="${PWD}"; rtl_fileop cd "${PKG_BASE_DIR}" || return "${?}"; rtl_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}" || return "${?}"; case "$(pkgp_fetch_extract_type "${PKG_NAME}")" in diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr index 45f5d58f..4babac8f 100644 --- a/subr/pkg_install_make.subr +++ b/subr/pkg_install_make.subr @@ -7,10 +7,6 @@ pkg_install_make() { ${PKG_MAKEFLAGS_INSTALL} \ ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ AR=${PKG_AR} CC=${PKG_CC} RANLIB=${PKG_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_LIBTOOL:-slibtool}" \ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ diff --git a/vars/env.vars b/vars/env.vars index 0cada3ef..6f87c4b1 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -1,3 +1,5 @@ +# +# WARNING: Do _NOT_ use whitespaces (` ') or tab (` ') # characters in any of the variables below save for MAKEFLAGS, # PATH, and TIMESTAMP_FMT. # @@ -15,19 +17,19 @@ DEFAULT_BUILD_STEPS=" DEFAULT_BUILD_VARS=" AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC \ CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \ - CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA \ - CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA \ - CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR \ - DISABLED ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES \ - INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA \ - INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA \ - LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA \ - LIBTOOL MAKE MAKE_INSTALL_VNAME MAKEFLAGS_BUILD \ - MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \ - NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PATCHES_EXTRA \ - PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE PREFIX RANLIB \ - RPM_DISABLE SHA256SUM SUBDIR TARGET URL URL_TYPE URLS_GIT \ + CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE \ + CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE \ + CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DISABLED ENV_VARS_EXTRA \ + FNAME GITROOT INHERIT_FROM INSTALL_FILES INSTALL_FILES \ + INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \ + INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ + LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ + MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \ + MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ + PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE \ + PREFIX RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT \ VERSION"; + # Path names : ${PREFIX_ROOT:=${HOME}/midipix}; : ${PREFIX:=${PREFIX_ROOT}/${ARCH}/${BUILD}}; |