diff options
| l--------- | 314.rsync.build (renamed from 314.openssh.build) | 0 | ||||
| l--------- | 333.openssh.build (renamed from 340.popt.build) | 0 | ||||
| l--------- | 341.rsync.build | 1 | ||||
| -rw-r--r-- | 354.util_linux.vars | 11 | ||||
| -rw-r--r-- | apk-tools-2.6.6.local.patch | 11 | ||||
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | build.vars | 23 | ||||
| -rw-r--r-- | pkg.build | 8 |
8 files changed, 50 insertions, 10 deletions
diff --git a/314.openssh.build b/314.rsync.build index 52bb82e5..52bb82e5 120000 --- a/314.openssh.build +++ b/314.rsync.build diff --git a/340.popt.build b/333.openssh.build index 52bb82e5..52bb82e5 120000 --- a/340.popt.build +++ b/333.openssh.build diff --git a/341.rsync.build b/341.rsync.build deleted file mode 120000 index 52bb82e5..00000000 --- a/341.rsync.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build
\ No newline at end of file diff --git a/354.util_linux.vars b/354.util_linux.vars new file mode 100644 index 00000000..20f843c4 --- /dev/null +++ b/354.util_linux.vars @@ -0,0 +1,11 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_util_linux_configure_pre() { + export NCURSESW_CFLAGS="-I${PREFIX_LVL3}/include -I${PREFIX_LVL3}/include/ncursesw"; + export PKG_CONFIG_LIBDIR="${PREFIX_LVL3}/lib/pkgconfig"; + export NCURSESW_LIBS="-L${PREFIX_LVL3}/lib $(env PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR} pkg-config --libs ncursesw)"; +}; + +# vim:filetype=sh diff --git a/apk-tools-2.6.6.local.patch b/apk-tools-2.6.6.local.patch new file mode 100644 index 00000000..5a863a99 --- /dev/null +++ b/apk-tools-2.6.6.local.patch @@ -0,0 +1,11 @@ +--- apk-tools-2.6.6/Make.rules.orig 2016-02-09 14:57:53.000000000 +0000 ++++ apk-tools-2.6.6/Make.rules 2016-02-13 19:04:27.012687754 +0000 +@@ -70,7 +70,7 @@ + INSTALLDIR := $(INSTALL) -d + + CFLAGS ?= -g -O2 +-CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC ++CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC + CFLAGS_ALL += $(CFLAGS) + + LDFLAGS ?= -g @@ -11,6 +11,7 @@ log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname) log_env_vars ${LOG_ENV_VARS}; (mkdir -p ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_TARGET} ${WORKDIR}; BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}}; +BUILD_SECS=$(command date +%s); for BUILD_LVL in 0 1 2 3; do for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do if [ -n "${ARG_BUILD_SCRIPTS}" ]\ @@ -54,6 +55,11 @@ for BUILD_LVL in 0 1 2 3; do fi; done; log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s)."; +: $((BUILD_SECS=$(command date +%s)-${BUILD_SECS})); +: $((BUILD_HOURS=${BUILD_SECS}/3600)); +: $((BUILD_MINUTES=(${BUILD_SECS}%3600)/60)); +: $((BUILD_SECS=(${BUILD_SECS}%3600)%60)); +log_msg info "Build time: ${BUILD_HOURS} hour(s), ${BUILD_MINUTES} minute(s), and ${BUILD_SECS} second(s)."; if [ $(( ${BUILD_NFINI} + ${BUILD_NSKIP} )) -ge 0 ]\ && [ ${BUILD_NFAIL} -eq 0 ]\ && [ ${ARG_TARBALL:-0} -eq 1 ]; then @@ -23,7 +23,7 @@ : ${PREFIX:=${HOME}/midipix}; : ${PREFIX_NATIVE:=${PREFIX}/native}; : ${TARGET:=x86_64-nt64-midipix}; -: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra install_target makeflags_build_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"}; +: ${PKG_VARS:="build_dir build_type configure_args configure_args_extra git_args_extra install_target makeflags_build_extra makeflags_install_extra no_clean no_config_cache no_configure no_destdir no_libtool_midipix no_patch_local patches_extra_url prefix prefix_extra unset_vars_build sha256sum subdir url url_type version AR CC CFLAGS LD LDFLAGS MAKEFLAGS PREFIX RANLIB"}; : ${PREFIX_TARGET:=${PREFIX}/${TARGET}}; : ${PREFIX_LVL0:=${PREFIX_TARGET}}; : ${PREFIX_LVL1:=${PREFIX_NATIVE}}; @@ -48,6 +48,14 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_LVL2_LDFLAGS_PATH:=-L${PREFIX_LVL2}/include}; : ${PKG_LVL3_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; +: ${PKG_APK_TOOLS_VERSION:=2.6.6}; +: ${PKG_APK_TOOLS_BUILD_DIR:=apk-tools-${PKG_APK_TOOLS_VERSION}}; +: ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; +: ${PKG_APK_TOOLS_CFLAGS:=-I${PREFIX_LVL3}/include}; +: ${PKG_APK_TOOLS_LDFLAGS:=-L${PREFIX_LVL3}/lib}; +: ${PKG_APK_TOOLS_MAKEFLAGS:=CROSS_COMPILE=${HOST_NATIVE}- LUAAPK= PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig VERBOSE=1}; +: ${PKG_APK_TOOLS_NO_CONFIGURE:=1}; +: ${PKG_APK_TOOLS_SHA256SUM:=7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af}; : ${PKG_BZIP2_AR:=${HOST_NATIVE}-ar}; : ${PKG_BZIP2_CC:=${HOST_NATIVE}-gcc}; : ${PKG_BZIP2_RANLIB:=${HOST_NATIVE}-ranlib}; @@ -100,9 +108,11 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_GIT_CC:=${HOST_NATIVE}-gcc}; : ${PKG_GIT_CFLAGS:=-I. -I${PREFIX_LVL3}/include}; : ${PKG_GIT_LDFLAGS:=-L${PREFIX_LVL3}/lib}; -: ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 V=99}; +: ${PKG_GIT_MAKEFLAGS:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99}; +: ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:=NO_CURL=1 NO_PERL=1 PREFIX=${PREFIX_LVL3} V=99}; : ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1}; : ${PKG_GIT_NO_CONFIGURE:=1}; +: ${PKG_GIT_NO_DESTDIR:=1}; : ${PKG_GIT_RANLIB:=${HOST_NATIVE}-ranlib}; : ${PKG_GIT_URL:=https://github.com/git/git.git}; : ${PKG_GIT_URL_TYPE:=git}; @@ -157,6 +167,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e}; : ${PKG_MUSL_VERSION:=1.1.12}; : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz}; +: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:=--with-pkg-config --with-pkg-config-libdir=${PREFIX_LVL3}/lib/pkgconfig --enable-pc-files --enable-widec}; +: ${PKG_NCURSES_MAKEFLAGS_INSTALL_EXTRA:=PKG_CONFIG_LIBDIR=/lib/pkgconfig}; : ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; : ${PKG_NCURSES_VERSION:=6.0}; : ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz}; @@ -170,11 +182,9 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_PATCH_SHA256SUM:=59c29f56faa0a924827e6a60c6accd6e2900eae5c6aaa922268c717f06a62048}; : ${PKG_PATCH_VERSION:=2.7}; : ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz}; -: ${PKG_POPT_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8}; -: ${PKG_POPT_VERSION:=1.16}; -: ${PKG_POPT_URL:=http://rpm5.org/files/popt/popt-${PKG_POPT_VERSION}.tar.gz}; +: ${PKG_RSYNC_UNSET_VARS_BUILD:="CFLAGS LDFLAGS"}; : ${PKG_RSYNC_CFLAGS:=-I${PREFIX_LVL3}/include}; -: ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-zlib}; +: ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-popt --with-included-zlib}; : ${PKG_RSYNC_LDFLAGS:=-L${PREFIX_LVL3}/lib}; : ${PKG_RSYNC_VERSION:=3.1.2}; : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz}; @@ -187,6 +197,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_UTIL_LINUX_CFLAGS:=-I${PREFIX_LVL3}/include}; : ${PKG_UTIL_LINUX_LDFLAGS:=-I${PREFIX_LVL3}/lib}; : ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-wall --disable-write}; +: ${PKG_UTIL_LINUX_UNSET_VARS_BUILD:=CFLAGS LDFLAGS}; : ${PKG_UTIL_LINUX_SHA256SUM:=133c14f625d40e90e73e9d200faf3f2ce87937b99f923c84e5504ac0badc71d6}; : ${PKG_UTIL_LINUX_VERSION:=2.27.1}; : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; @@ -4,7 +4,7 @@ # Order for build level 2 (runtime:) psxtypes pemagine dalist ntapi psxscl ntcon ntctty parse_with_pkg_name ${2} \ - bash binutils binutils_host bzip2 coreutils \ + apk_tools bash binutils binutils_host bzip2 coreutils \ dalist dash diffutils findutils gawk git gmp \ grep gzip less libelf libressl libz make mpc mpfr \ ncurses ntapi ntcon ntctty openssh patch pemagine \ @@ -77,6 +77,8 @@ fi; cd ${BUILD_DIR}; if [ ${PKG_NO_CONFIGURE:-0} -eq 0 ]\ && ! is_build_script_done configure; then + command -v pkg_${PKG_NAME}_configure_pre >/dev/null \ + && pkg_${PKG_NAME}_configure_pre; ../${PKG_SUBDIR}/configure \ ${_configure_args} \ ${PKG_CONFIGURE_ARGS_EXTRA}; @@ -105,7 +107,7 @@ if ! is_build_script_done install1; then if command -v pkg_${PKG_NAME}_install >/dev/null; then pkg_${PKG_NAME}_install; elif [ ${PKG_NO_DESTDIR:-0} -eq 0 ]; then - make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_BUILD_EXTRA}}\ + make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_INSTALL_EXTRA}}\ ${MAKEFLAGS} \ ${AR:+AR=${AR}} \ ${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \ @@ -114,7 +116,7 @@ if ! is_build_script_done install1; then DESTDIR=${PREFIX_LVL} \ ${PKG_INSTALL_TARGET:-install}; else - make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_BUILD_EXTRA}}\ + make ${PKG_MAKEFLAGS_INSTALL_EXTRA:+${PKG_MAKEFLAGS_INSTALL_EXTRA}}\ ${MAKEFLAGS} \ ${AR:+AR=${AR}} \ ${CC:+CC=${CC}} ${CFLAGS:+"CFLAGS=${CFLAGS}"} \ |