diff options
| -rwxr-xr-x | etc/rotate_archives.sh | 2 | ||||
| -rw-r--r-- | vars/build.vars | 4 | ||||
| -rw-r--r-- | vars/invariants_minipix.vars | 2 | ||||
| -rw-r--r-- | vars/pkgconf_host.vars | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/etc/rotate_archives.sh b/etc/rotate_archives.sh index 546fdf0b..f0bbe100 100755 --- a/etc/rotate_archives.sh +++ b/etc/rotate_archives.sh @@ -54,4 +54,4 @@ rotate_builds() { set -o errexit -o noglob; rotate_builds "${1}" "${2:-3}"; -# vim:noexpandtab sw=8 ts=8 +# vim:noexpandtab sw=8 ts=8 diff --git a/vars/build.vars b/vars/build.vars index 2024b3dc..9256a978 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -381,7 +381,7 @@ HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix="; HOST_PACKAGES_DEPS_PACKAGES=" clzip_host ncurses_host ncursesw_host ncursestw_host cmake_host -musl_fts_host libzip_host llvm_host clang_host libffi_host expat_host +musl_fts_host libzip_host llvm_host clang_host libffi_host expat_host gdbm_host libreadline_host python2_host gdb_host dbus_host infounzip_host infozip_host intltool_host xz_host python3_host gettext_tiny_host glib_host pcre_host dbus_glib_host gperf_host ruby_host tzdb_host"; @@ -1716,7 +1716,7 @@ fi; : ${PKG_NCDU_ENV_VARS_EXTRA:=LIBS=-lncursesw -ltinfow}; : ${PKG_NULLMAILER_SHA256SUM:=6d277f69f1999c86df0ca9a97a4f14f9bb431c50fd4e016918290b84ff679241} : ${PKG_NULLMAILER_VERSION:=2.2} -: ${PKG_NULLMAILER_URL:=https://github.com/bruceg/nullmailer/archive/${PKG_NULLMAILER_VERSION}.tar.gz} +: ${PKG_NULLMAILER_URL:=https://github.com/bruceg/nullmailer/archive/${PKG_NULLMAILER_VERSION}.tar.gz}; : ${PKG_NULLMAILER_CONFIGURE_ARGS_EXTRA:="--enable-tls"} : ${PKG_NULLMAILER_IN_TREE:=1} : ${PKG_NULLMAILER_SUBDIR:=nullmailer-${PKG_NULLMAILER_VERSION}}; diff --git a/vars/invariants_minipix.vars b/vars/invariants_minipix.vars index 2f00ec21..055254e9 100644 --- a/vars/invariants_minipix.vars +++ b/vars/invariants_minipix.vars @@ -56,7 +56,7 @@ pkg_invariants_minipix_all() { ex_rtl_fileop cp_follow "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share"; fi; done; - if [ ! -L "${PREFIX_MINIPIX}/share/nanorc" ]; then + if [ ! -L "${PREFIX_MINIPIX}/share/nanorc" ]; then ex_rtl_fileop ln_symbolic "nano/nanorc.nanorc" "${PREFIX_MINIPIX}/share/nanorc"; fi; if [ ! -L "${PREFIX_MINIPIX}/share/vimrc" ]; then diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars index 9f73c7f6..b3923a26 100644 --- a/vars/pkgconf_host.vars +++ b/vars/pkgconf_host.vars @@ -14,8 +14,7 @@ fi; if [ "\${#}" -eq 1 ]\ && [ "x\${1}" = "x--version" ]; then "\$(dirname "\${0}")"/pkgconf --version; - -else +else "\$(dirname "\${0}")"/pkgconf --define-variable=prefix="\${PREFIX_NATIVE%/}/" --keep-system-cflags "\${@}"; fi; EOF |