diff options
| -rw-r--r-- | subr/pkg_patch.subr | 26 | ||||
| -rw-r--r-- | vars/build.vars | 22 | ||||
| -rw-r--r-- | vars/ncursesw.vars | 18 |
3 files changed, 31 insertions, 35 deletions
diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index 3730395c..de32fe30 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -4,23 +4,25 @@ pkg_patch() { local _patch_fname; - if [ -d "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}" ]; then - set +o noglob; - for _patch_fname in ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch; do - patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; - done; - set -o noglob; - fi; + set +o noglob; for _patch_fname in \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local@${BUILD_HNAME}.patch \ + ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ + ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch; do if [ -r "${_patch_fname}" ]; then patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; fi; done; + set -o noglob; }; # vim:filetype=sh diff --git a/vars/build.vars b/vars/build.vars index 500db8de..106c6282 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -251,9 +251,10 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; LIB_PACKAGES_PACKAGES_LEAVES=" -apr apr_util bzip2 curl expat libz libffi gdbm geoip pcre glib gzip libarchive libatomic_ops -libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba -libxml2 lua ncurses ncursestw ncursesw npth sqlite3 xz"; +apr apr_util bzip2 bzip2_flavour_minipix curl expat libz libffi gdbm geoip pcre glib gzip +gzip_flavour_minipix libarchive libatomic_ops libpipeline libressl libevent libfetch libgpg_error +libassuan libfirm libgcrypt libksba libxml2 lua ncurses ncursestw ncursesw npth sqlite3 xz +xz_flavour_minipix"; LIB_PACKAGES_PACKAGES_X11=" inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11 libXext libICE libSM libXt libXmu renderproto Xrender libXpm libXaw libxkbfile"; @@ -277,11 +278,14 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BZIP2_VERSION:=1.0.6}; : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz}; : ${PKG_BZIP2_BUILD_DIR:=bzip2-${PKG_BZIP2_VERSION}}; -: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${PACKAGES_CFLAGS_CONFIGURE}}; +: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}}; : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless libbz2.so.1.0=lib/ libbz2.so.1.0.6=lib/"}; : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so}; : ${PKG_BZIP2_MAKEFLAGS_INSTALL_EXTRA:=PREFIX=${PREFIX_NATIVE}}; : ${PKG_BZIP2_NO_CLEAN:=1}; +: ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"}; +: ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; +: ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="PREFIX=${PREFIX_MINIPIX}"}; : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde}; : ${PKG_CURL_VERSION:=7.51.0}; : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2}; @@ -320,6 +324,9 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_GZIP_CONFIGURE_ARGS:=--host=${TARGET} --prefix= --target=${TARGET}}; : ${PKG_GZIP_MAKEFLAGS_BUILD_EXTRA:=OBJA= prefix=}; : ${PKG_GZIP_MAKEFLAGS_INSTALL_EXTRA:=OBJA= prefix=}; +: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"}; +: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-static"}; +: ${PKG_GZIP_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="DESTDIR=${PREFIX_MINIPIX} OBJA= prefix="}; : ${PKG_LIBARCHIVE_SHA256SUM:=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f}; : ${PKG_LIBARCHIVE_VERSION:=3.2.2}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; @@ -405,6 +412,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2}; : ${PKG_XZ_VERSION:=5.2.2}; : ${PKG_XZ_URL:=https://github.com/xz-mirror/xz/releases/download/v${PKG_XZ_VERSION}/xz-${PKG_XZ_VERSION}.tar.gz}; +: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD:="LIBTOOLFLAGS=-all-static"}; +: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"}; : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d}; : ${PKG_INPUTPROTO_VERSION:=2.3.2}; @@ -494,7 +503,7 @@ apk_tools bash bash_flavour_minipix bc bdwgc bind chicken clang_host coreutils c cparser cron dash datamash diffutils dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openlitespeed openssh p7zip pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic -tar tcsh the_silver_searcher tmux util_linux vim weechat wget which whois xeyes xwd zsh"; +tar tar_flavour_minipix tcsh the_silver_searcher tmux util_linux vim weechat wget which whois xeyes xwd zsh"; LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -778,6 +787,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_TAR_SHA256SUM:=cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0}; : ${PKG_TAR_VERSION:=1.29}; : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz}; +: ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"}; +: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; +: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"}; : ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d}; : ${PKG_TCSH_VERSION:=6.20.00}; : ${PKG_TCSH_URL:=http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz}; diff --git a/vars/ncursesw.vars b/vars/ncursesw.vars deleted file mode 100644 index 4f404091..00000000 --- a/vars/ncursesw.vars +++ /dev/null @@ -1,18 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -pkg_ncursesw_install_post() { - local __; - for __ in \ - bin/captoinfo bin/clear bin/infocmp bin/infotocap bin/ncursesw6-config \ - bin/reset bin/tabs bin/tic bin/toe bin/tput bin/tset \ - lib/libformw* lib/libmenuw* lib/libncursesw* lib/libpanelw* \ - share/man share/tabset share/terminfo; do - set +o noglob; - build_fileop cp ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*}; - set -o noglob; - done; -}; - -# vim:filetype=sh |