diff options
author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-01 21:09:37 +0000 |
commit | bf9edfaed49c4387e181be454602e0cc65fe4382 (patch) | |
tree | 2bf582d4f1f0916946bc2285014b193482c52d86 /groups | |
parent | 725770754d9f53d5b41d876053a7a993b629472e (diff) | |
download | midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.bz2 midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.xz |
General cleanup, pt. III.
dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
Diffstat (limited to 'groups')
-rw-r--r-- | groups/000.host_tools.group | 26 | ||||
-rw-r--r-- | groups/010.host_deps.group | 46 | ||||
-rw-r--r-- | groups/020.host_deps_rpm.group | 6 | ||||
-rw-r--r-- | groups/200.native_packages.group | 4 | ||||
-rw-r--r-- | groups/211.native_packages_cmdline.group | 5 | ||||
-rw-r--r-- | groups/221.native_packages_dev.group | 14 | ||||
-rw-r--r-- | groups/231.native_packages_etc.group | 21 | ||||
-rw-r--r-- | groups/241.native_packages_inet.group | 6 | ||||
-rw-r--r-- | groups/251.native_packages_lib.group | 7 | ||||
-rw-r--r-- | groups/261.native_packages_x11.group | 6 | ||||
-rw-r--r-- | groups/800.minipix.group | 4 | ||||
-rw-r--r-- | groups/999.dist.group | 3 | ||||
-rw-r--r-- | groups/dev_packages.group | 2 |
13 files changed, 75 insertions, 75 deletions
diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group index 09327e7f..6c9318b0 100644 --- a/groups/000.host_tools.group +++ b/groups/000.host_tools.group @@ -5,8 +5,32 @@ HOST_TOOLS_BUILD_TYPE="host"; HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}"; HOST_TOOLS_MAKEFLAGS_INSTALL="prefix= PREFIX="; HOST_TOOLS_PACKAGES=" -pkgconf_host slibtool_host"; +autoconf_host automake_host gettext_tiny_host install_strip_host +libtool_host m4_host pkgconf_host slibtool_host"; HOST_TOOLS_PREFIX="${PREFIX}"; +: ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; +: ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; +: ${PKG_AUTOCONF_HOST_VERSION:=2.69}; +: ${PKG_AUTOCONF_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_HOST_VERSION}.tar.xz}; +: ${PKG_AUTOMAKE_HOST_DEPENDS:="autoconf_host pkgconf_host slibtool_host"}; +: ${PKG_AUTOMAKE_HOST_SHA256SUM:=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921}; +: ${PKG_AUTOMAKE_HOST_VERSION:=1.16.1}; +: ${PKG_AUTOMAKE_HOST_URL:=https://ftp.gnu.org/gnu/automake/automake-${PKG_AUTOMAKE_HOST_VERSION}.tar.xz}; +: ${PKG_GETTEXT_TINY_HOST_DEPENDS:="pkgconf_host slibtool_host"}; +: ${PKG_GETTEXT_TINY_HOST_SHA256SUM:=95fdc541bc7bda2f93d9768533bfa9b82a4d4cd447e059e95450150bdd690e9f}; +: ${PKG_GETTEXT_TINY_HOST_VERSION:=0.3.1}; +: ${PKG_GETTEXT_TINY_HOST_URL:=http://ftp.barfooze.de/pub/sabotage/tarballs/gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}.tar.xz}; +: ${PKG_GETTEXT_TINY_HOST_BUILD_DIR:=gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}}; +: ${PKG_GETTEXT_TINY_HOST_MAKEFLAGS_BUILD_EXTRA:="prefix=${PREFIX}"}; +: ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1}; +: ${PKG_LIBTOOL_HOST_DEPENDS:="autoconf_host automake_host pkgconf_host slibtool_host"}: +: ${PKG_LIBTOOL_HOST_SHA256SUM:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f}; +: ${PKG_LIBTOOL_HOST_VERSION:=2.4.6}; +: ${PKG_LIBTOOL_HOST_URL:=https://ftp.gnu.org/gnu/libtool/libtool-${PKG_LIBTOOL_HOST_VERSION}.tar.xz}; +: ${PKG_M4_HOST_DEPENDS:="pkgconf_host slibtool_host"}; +: ${PKG_M4_HOST_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07}; +: ${PKG_M4_HOST_VERSION:=1.4.18}; +: ${PKG_M4_HOST_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_HOST_VERSION}.tar.xz}; : ${PKG_PKGCONF_HOST_DEPENDS:="slibtool_host"}; : ${PKG_PKGCONF_HOST_SHA256SUM:=61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210}; : ${PKG_PKGCONF_HOST_VERSION:=1.6.3}; diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index 142f6c0a..4bf6bd4c 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -2,32 +2,21 @@ # Build group host_deps # HOST_DEPS_BUILD_TYPE="host"; -HOST_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include"; -HOST_DEPS_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS_HOST:+${DEFAULT_CXXFLAGS_HOST} }-I${PREFIX}/include"; +HOST_DEPS_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS_HOST}" "-I${PREFIX}/include")"; +HOST_DEPS_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS_HOST}" "-I${PREFIX}/include")"; HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-prefix="; HOST_DEPS_GROUP_DEPENDS="host_tools"; HOST_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; HOST_DEPS_MAKEFLAGS_INSTALL="prefix= PREFIX="; HOST_DEPS_PACKAGES=" -autoconf_host automake_host bison_host bmake_host bzip2_host -chainport_host clang_host clzip_host cmake_host dbus_glib_host dbus_host -expat_host file_host flex_host gdb_host gdbm_host gettext_tiny_host -glib_host gperf_host infounzip_host infozip_host install_strip_host -intltool_host libffi_host libreadline_host libressl_host libtool_host -libz_host libzip_host llvm_host m4_host mdso_host mpackage_host -musl_fts_host ncurses_host ncursestw_host ncursesw_host pcre_host -perk_host python2_host python3_host ruby_host sqlite3_host texinfo_host -tzdb_host xz_host"; +bison_host bmake_host bzip2_host chainport_host clang_host clzip_host +cmake_host dbus_glib_host dbus_host expat_host file_host flex_host +gdb_host gdbm_host glib_host gperf_host infounzip_host infozip_host +intltool_host libffi_host libreadline_host libressl_host libz_host +libzip_host llvm_host mdso_host mpackage_host musl_fts_host ncurses_host +ncursestw_host ncursesw_host pcre_host perk_host python2_host python3_host +ruby_host sqlite3_host texinfo_host tzdb_host xz_host"; HOST_DEPS_PREFIX="${PREFIX}"; -: ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host"}; -: ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; -: ${PKG_AUTOCONF_HOST_VERSION:=2.69}; -: ${PKG_AUTOCONF_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_HOST_VERSION}.tar.xz}; -: ${PKG_AUTOMAKE_HOST_DEPENDS:="autoconf_host"}; -: ${PKG_AUTOMAKE_HOST_SHA256SUM:=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921}; -: ${PKG_AUTOMAKE_HOST_VERSION:=1.16.1}; -: ${PKG_AUTOMAKE_HOST_URL:=https://ftp.gnu.org/gnu/automake/automake-${PKG_AUTOMAKE_HOST_VERSION}.tar.xz}; -: ${PKG_BISON_HOST_DEPENDS:="m4_host"}; : ${PKG_BISON_HOST_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641}; : ${PKG_BISON_HOST_VERSION:=3.5}; : ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz}; @@ -85,21 +74,16 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_GDB_HOST_VERSION:=7.12}; : ${PKG_GDB_HOST_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_HOST_VERSION}.tar.gz}; : ${PKG_GDB_HOST_CFLAGS_CONFIGURE_EXTRA:="-g3 -O0 -I${PREFIX}/include/python2.7"}; -: ${PKG_GDB_HOST_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX}/lib"}; -: ${PKG_GDB_HOST_CXXFLAGS_CONFIGURE_EXTRA:="-fpermissive -g3 -O0 -I${PREFIX}/include/python2.7"}; : ${PKG_GDB_HOST_CONFIGURE_ARGS:="--disable-nls --prefix= --target=${DEFAULT_TARGET} --with-system-libiberty --with-system-readline --with-system-zlib --with-python=python2.7"}; +: ${PKG_GDB_HOST_CXXFLAGS_CONFIGURE_EXTRA:="-fpermissive -g3 -O0 -I${PREFIX}/include/python2.7"}; : ${PKG_GDB_HOST_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 -I${PREFIX}/include/python2.7"}; +: ${PKG_GDB_HOST_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX}/lib"}; : ${PKG_GDB_HOST_LIBTOOL:=rdlibtool}; : ${PKG_GDB_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_HOST_VERSION}.midipix.patch"}; : ${PKG_GDBM_HOST_SHA256SUM:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc}; : ${PKG_GDBM_HOST_VERSION:=1.18.1}; : ${PKG_GDBM_HOST_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_HOST_VERSION}.tar.gz}; : ${PKG_GDBM_HOST_CONFIGURE_ARGS_EXTRA:=--enable-libgdbm-compat}; -: ${PKG_GETTEXT_TINY_HOST_SHA256SUM:=95fdc541bc7bda2f93d9768533bfa9b82a4d4cd447e059e95450150bdd690e9f}; -: ${PKG_GETTEXT_TINY_HOST_VERSION:=0.3.1}; -: ${PKG_GETTEXT_TINY_HOST_URL:=http://ftp.barfooze.de/pub/sabotage/tarballs/gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}.tar.xz}; -: ${PKG_GETTEXT_TINY_HOST_BUILD_DIR:=gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}}; -: ${PKG_GETTEXT_TINY_HOST_MAKEFLAGS_BUILD_EXTRA:="prefix=${PREFIX}"}; : ${PKG_GLIB_HOST_DEPENDS:="python3_host"}; : ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a}; : ${PKG_GLIB_HOST_VERSION:=2.54.0}; @@ -116,7 +100,6 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_INFOUNZIP_HOST_IN_TREE:=1}; : ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master}; : ${PKG_INFOZIP_HOST_IN_TREE:=1}; -: ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1}; : ${PKG_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd}; : ${PKG_INTLTOOL_HOST_VERSION:=0.51.0}; : ${PKG_INTLTOOL_HOST_URL:=https://launchpad.net/intltool/trunk/${PKG_INTLTOOL_HOST_VERSION}/+download/intltool-${PKG_INTLTOOL_HOST_VERSION}.tar.gz}; @@ -134,10 +117,6 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_LIBRESSL_HOST_SHA256SUM:=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e}; : ${PKG_LIBRESSL_HOST_VERSION:=3.0.2}; : ${PKG_LIBRESSL_HOST_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_HOST_VERSION}.tar.gz}; -: ${PKG_LIBTOOL_HOST_DEPENDS:="autoconf_host automake_host"}: -: ${PKG_LIBTOOL_HOST_SHA256SUM:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f}; -: ${PKG_LIBTOOL_HOST_VERSION:=2.4.6}; -: ${PKG_LIBTOOL_HOST_URL:=https://ftp.gnu.org/gnu/libtool/libtool-${PKG_LIBTOOL_HOST_VERSION}.tar.xz}; : ${PKG_LIBZ_HOST_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b}; : ${PKG_LIBZ_HOST_VERSION:=1.2.8.2015.12.26}; : ${PKG_LIBZ_HOST_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_HOST_VERSION}.tar.gz}; @@ -150,9 +129,6 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_LLVM_HOST_VERSION:=3.8.1}; : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz}; : ${PKG_LLVM_HOST_DISABLED:=1}; -: ${PKG_M4_HOST_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07}; -: ${PKG_M4_HOST_VERSION:=1.4.18}; -: ${PKG_M4_HOST_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_HOST_VERSION}.tar.xz}; : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="}; : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"}; diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group index 7a12143f..93722499 100644 --- a/groups/020.host_deps_rpm.group +++ b/groups/020.host_deps_rpm.group @@ -2,8 +2,8 @@ # Build group host_deps_rpm # HOST_DEPS_RPM_BUILD_TYPE="host"; -HOST_DEPS_RPM_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include"; -HOST_DEPS_RPM_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS_HOST:+${DEFAULT_CXXFLAGS_HOST} }-I${PREFIX}/include"; +HOST_DEPS_RPM_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS_HOST}" "-I${PREFIX}/include")"; +HOST_DEPS_RPM_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS_HOST}" "-I${PREFIX}/include")"; HOST_DEPS_RPM_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}"; HOST_DEPS_RPM_GROUP_DEPENDS="host_deps host_tools"; HOST_DEPS_RPM_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; @@ -26,7 +26,7 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}"; : ${PKG_RPM_HOST_VERSION:=4.15.1}; : ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2}; : ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include"}; -: ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="-without-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"}; +: ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --enable-lmdb --with-crypto=openssl --with-vendor=midipix --without-lua"}; : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; # vim:filetype=sh textwidth=0 diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group index 3e0adbf1..1f677d52 100644 --- a/groups/200.native_packages.group +++ b/groups/200.native_packages.group @@ -1,8 +1,8 @@ # # Build group native_packages # -NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS:+${DEFAULT_CXXFLAGS} }--sysroot=${PREFIX_NATIVE}"; +NATIVE_PACKAGES_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")"; +NATIVE_PACKAGES_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS}" "--sysroot=${PREFIX_NATIVE}")"; NATIVE_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}"; NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; NATIVE_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_toolchain native_tools"; diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index 2780c4d4..eb277e50 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -2,12 +2,11 @@ # Build group native_packages (cmdline) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " bash bc busybox calcurse coreutils dash datamash dos2unix ed figlet findutils gawk grep mc mksh moon_buggy mpg123 nano ninvaders openbsd_baseutils rc sbase screen sed sloccount tar tcsh -the_silver_searcher toilet tree terminally_tetris ubase which zsh"; +the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_BASH_DEPENDS:="ncurses"}; : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb}; : ${PKG_BASH_VERSION:=4.4}; diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group index 38ee1972..94d1a8f7 100644 --- a/groups/221.native_packages_dev.group +++ b/groups/221.native_packages_dev.group @@ -2,10 +2,9 @@ # Build group native_packages (dev) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } -bison chicken cparser diffutils flex gdb lunix m4 make mandoc nasm patch -patchutils perl python2 python3 ruby smallbasic tk"; +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " +bison chicken cparser diffutils flex gdb lua lunix m4 make mandoc nasm +patch patchutils perl python2 python3 ruby smallbasic tk")"; : ${PKG_BISON_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641}; : ${PKG_BISON_VERSION:=3.5}; : ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_VERSION}.tar.xz}; @@ -44,6 +43,13 @@ patchutils perl python2 python3 ruby smallbasic tk"; : ${PKG_GDB_LIBTOOL:=rdlibtool}; : ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"}; : ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"}; +: ${PKG_LUA_SHA256SUM:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c}; +: ${PKG_LUA_VERSION:=5.3.4}; +: ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz}; +: ${PKG_LUA_IN_TREE:=1}; +: ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"}; +: ${PKG_LUA_FORCE_AUTORECONF:=1}; +: ${PKG_LUA_INSTALL_FILES:=@liblua.so=lib/liblua.so.0}; : ${PKG_LUNIX_DEPENDS:="lua"}; : ${PKG_LUNIX_URLS_GIT:=lunix=https://github.com/Redfoxmoon3/lunix.git@master}; : ${PKG_LUNIX_IN_TREE:=1}; diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 9f17432e..9bb658d9 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -2,16 +2,15 @@ # Build group native_packages (etc) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " alsa_lib apr apr_util bdwgc bmake bochs bzip2 clzip cmake cron curl dante dbus debianutils emacs expat ffmpeg file gdbm geoip gettext_tiny ghostscript giflib glib gnuchess gzip hastyhex hexcurse htop icecast -imagemagick infounzip infozip john lcms2 less lmdb lolcode lua mintty -mlogin musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjpeg -p7zip pcre popt procps_ng qemu qpdf qrencode rpm rw shared_mime_info -slang sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim -w32api w32lib xorriso xz yabasic zstd"; +imagemagick infounzip infozip john lcms2 less lmdb lolcode mintty mlogin +musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjpeg p7zip +pcre popt procps_ng qemu qpdf qrencode rpm rw shared_mime_info slang +sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim w32api +w32lib xorriso xz yabasic zstd")"; : ${PKG_ALSA_LIB_SHA256SUM:=3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf}; : ${PKG_ALSA_LIB_VERSION:=1.1.8}; : ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_ALSA_LIB_VERSION}.tar.bz2}; @@ -192,12 +191,6 @@ w32api w32lib xorriso xz yabasic zstd"; : ${PKG_LMDB_IN_TREE:=1}; : ${PKG_LOLCODE_URLS_GIT:="lci=https://github.com/justinmeza/lci.git@master"}; : ${PKG_LOLCODE_BUILD_DIR:=lci}; -: ${PKG_LUA_SHA256SUM:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c}; -: ${PKG_LUA_VERSION:=5.3.4}; -: ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz}; -: ${PKG_LUA_IN_TREE:=1}; -: ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"}; -: ${PKG_LUA_INSTALL_FILES:=@liblua.so=lib/liblua.so.0}; : ${PKG_MINTTY_DEPENDS:="w32api w32lib"}; : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"}; : ${PKG_MINTTY_CONFIGURE:=bmintty/configure}; @@ -205,6 +198,7 @@ w32api w32lib xorriso xz yabasic zstd"; : ${PKG_MINTTY_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib/w32lib}; : ${PKG_MLOGIN_URLS_GIT:="mlogin=https://github.com/Redfoxmoon3/mlogin.git@master"}; : ${PKG_MLOGIN_BUILD_DIR:=mlogin}; +: ${PKG_MLOGIN_FORCE_AUTORECONF:=1}; : ${PKG_MUSL_COMPAT_URLS_GIT:=musl_compat=https://github.com/Redfoxmoon3/musl-compat.git@master}; : ${PKG_MUSL_COMPAT_BUILD_DIR:=musl_compat}; : ${PKG_MUSL_FTS_SHA256SUM:=32dfe02768f1d3d91ab04df4fbdb7922cd34cd529ce7081a78c3ca8b8652d1ee}; @@ -311,6 +305,7 @@ w32api w32lib xorriso xz yabasic zstd"; : ${PKG_TDNF_VERSION:=2.0.0-alpha.1}; : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}.tar.gz}; : ${PKG_TDNF_CONFIGURE_ARGS_EXTRA:="--disable-static"}; +: ${PKG_TDNF_FORCE_AUTORECONF:=1}; : ${PKG_TDNF_IN_TREE:=1}; : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}}; : ${PKG_TEXINFO_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa}; diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 3d74f8cf..dc7f21bb 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -2,12 +2,11 @@ # Build group native_packages (inet) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " apk_tools aria2 bind ca_certificates dropbear fetchmail git gnupg gnutls httpd inetutils irssi isync ldns lighttpd lynx mailutils microsocks mtr mutt nginx nullmailer openlitespeed opensmtpd openssh pacman rsync socat -thttpd w3m weechat wget whois"; +thttpd w3m weechat wget whois")"; : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"}; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -128,6 +127,7 @@ thttpd w3m weechat wget whois"; : ${PKG_NULLMAILER_VERSION:=2.2} : ${PKG_NULLMAILER_URL:=https://github.com/bruceg/nullmailer/archive/${PKG_NULLMAILER_VERSION}.tar.gz}; : ${PKG_NULLMAILER_CONFIGURE_ARGS_EXTRA:="--enable-tls"} +: ${PKG_NULLMAILER_FORCE_AUTORECONF:=1}; : ${PKG_NULLMAILER_IN_TREE:=1} : ${PKG_NULLMAILER_SUBDIR:=nullmailer-${PKG_NULLMAILER_VERSION}}; : ${PKG_OPENLITESPEED_SHA256SUM:=11cea34ebb0d72e5c620c61dce9ee4982474311dc5f35e0737a6b6d760bcf577}; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 328da3d0..c7d52039 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -2,13 +2,12 @@ # Build group native_packages (libs) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " libarchive libasr libassuan libatomic_ops libdmtx libedit libelf libevent libfetch libffi libfirm libflac libgcrypt libgpg_error libjpeg_turbo libksba libnettle libogg libpcap libpipeline libpng libreadline libredwg libressl libsasl2 libshine libsndfile libsolv libtelnet libtheora libtirpc -libudns libunistring libuv libvorbis libxml2 libxslt libz libzip"; +libudns libunistring libuv libvorbis libxml2 libxslt libz libzip")"; : ${PKG_LIBARCHIVE_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e}; : ${PKG_LIBARCHIVE_VERSION:=3.3.3}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; @@ -16,6 +15,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip"; : ${PKG_LIBASR_SHA256SUM:=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d}; : ${PKG_LIBASR_VERSION:=1.0.3}; : ${PKG_LIBASR_URL:=https://www.opensmtpd.org/archives/libasr-${PKG_LIBASR_VERSION}.tar.gz}; +: ${PKG_LIBASR_FORCE_AUTORECONF:=1}; : ${PKG_LIBASR_IN_TREE:=1}; : ${PKG_LIBASSUAN_DEPENDS:="libgpg_error"}; : ${PKG_LIBASSUAN_SHA256SUM:=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702}; @@ -75,6 +75,7 @@ libudns libunistring libuv libvorbis libxml2 libxslt libz libzip"; : ${PKG_LIBGPG_ERROR_SHA256SUM:=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c}; : ${PKG_LIBGPG_ERROR_VERSION:=1.36}; : ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2}; +: ${PKG_LIBGPG_ERROR_FORCE_AUTORECONF:=1}; : ${PKG_LIBGPG_ERROR_IN_TREE:=1}; : ${PKG_LIBJPEG_TURBO_SHA256SUM:=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed}; : ${PKG_LIBJPEG_TURBO_VERSION:=2.0.2}; diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index a230c3cd..9e12c691 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -2,8 +2,7 @@ # Build group native_packages (x11) # GROUP_TARGET="native_packages"; -NATIVE_PACKAGES_PACKAGES=" -${NATIVE_PACKAGES_PACKAGES:+${NATIVE_PACKAGES_PACKAGES} } +NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " atk at_spi2_atk at_spi2_core cairo dbus_glib fontconfig freetype freetype_pre fribidi gdk glew gtk2 gtk3 harfbuzz imlib2 libass libcaca libepoxy libfontenc libICE libpthread_stubs libSM libX11 libXau libXaw @@ -11,7 +10,7 @@ libXdamage libXdmcp libXext libxfce4ui libxfce4util libXfixes libXfont2 libXft libXi libxkbfile libXmu libXpm libXt libXtst mesa pango pixman rdesktop rxvt_unicode sdl1 sdl2 st util_macros xcb xcb_proto xcb_util xcb_util_image xcb_util_wm xcowsay xeyes xfconf xorgproto Xrender xterm -xtrans xwd xwin"; +xtrans xwd xwin")"; : ${PKG_ATK_DEPENDS:="glib"}; : ${PKG_ATK_VERSION:=2.26.0}; : ${PKG_ATK_SHA256SUM:=eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827}; @@ -294,6 +293,7 @@ xtrans xwd xwin"; : ${PKG_XTERM_URL:=ftp://ftp.invisible-island.net/xterm/xterm-${PKG_XTERM_VERSION}.tgz}; : ${PKG_XTERM_CONFIGURE_ARGS_EXTRA:="--disable-setuid --disable-setgid --disable-full-tgetent --enable-ansi-color --enable-88-color --enable-256-color --enable-broken-osc --enable-broken-st --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-warnings --enable-tcap-query --enable-logging --enable-dabbrev --enable-freetype --enable-luit --enable-mini-luit --enable-narrowproto --enable-exec-xterm --enable-sixel-graphics --with-utempter"}; : ${PKG_XTERM_ENV_VARS_EXTRA:=LIBS=-lncurses -ltinfo}; +: ${PKG_XTRANS_DEPENDS:="util_macros"}; : ${PKG_XTRANS_SHA256SUM:=adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301}; : ${PKG_XTRANS_VERSION:=1.3.5}; : ${PKG_XTRANS_URL:=https://www.x.org/releases/individual/lib/xtrans-${PKG_XTRANS_VERSION}.tar.bz2}; diff --git a/groups/800.minipix.group b/groups/800.minipix.group index 153ebb17..8600c01d 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -1,8 +1,8 @@ # # Build group minipix # -MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -MINIPIX_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS:+${DEFAULT_CXXFLAGS} }--sysroot=${PREFIX_NATIVE}"; +MINIPIX_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")"; +MINIPIX_CXXFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CXXFLAGS}" "--sysroot=${PREFIX_NATIVE}")"; MINIPIX_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}"; MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; MINIPIX_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_packages native_toolchain native_tools"; diff --git a/groups/999.dist.group b/groups/999.dist.group index 01af27f4..c980cf47 100644 --- a/groups/999.dist.group +++ b/groups/999.dist.group @@ -3,8 +3,7 @@ # DIST_FORCE=1; DIST_NO_LOG_VARS=1; -DIST_PACKAGES="dist_digest dist_gitref dist_minipix dist_zipdist"; -: ${PKG_DIST_TARBALLS_DEPENDS:="dist_digest dist_minipix"}; +DIST_PACKAGES="dist_gitref dist_minipix dist_zipdist"; : ${PKG_DIST_ZIPDIST_DEPENDS:="dist_minipix"}; # vim:filetype=sh textwidth=0 diff --git a/groups/dev_packages.group b/groups/dev_packages.group index def41522..d0e4bb60 100644 --- a/groups/dev_packages.group +++ b/groups/dev_packages.group @@ -2,7 +2,7 @@ # Build group dev_packages # GROUP_AUTO=0; -DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; +DEV_PACKAGES_CFLAGS_CONFIGURE="$(rtl_lconcat "${DEFAULT_CFLAGS}" "--sysroot=${PREFIX_NATIVE}")"; DEV_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}"; DEV_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; DEV_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_packages native_toolchain native_tools"; |