From a9b6f174b5eb33f49956a884b42a6bef6296ac4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 26 Jun 2016 10:26:03 +0000 Subject: Adds mc v4.8.17. Change default ${PREFIX} to ${HOME}/midipix/${ARCH}. --- 337.mc.build | 1 + 337.mksh.build | 1 - 337.mksh.vars | 33 --------------------------------- 338.mksh.build | 1 + 338.mksh.vars | 33 +++++++++++++++++++++++++++++++++ 338.nano.build | 1 - 339.nano.build | 1 + 339.netcat.build | 1 - 339.netcat.vars | 10 ---------- 340.netcat.build | 1 + 340.netcat.vars | 10 ++++++++++ 340.openssh.build | 1 - 341.openssh.build | 1 + 341.pacman.build | 1 - 342.pacman.build | 1 + 342.patch.build | 1 - 343.patch.build | 1 + 343.perl.build | 1 - 343.perl.vars | 24 ------------------------ 344.perl.build | 1 + 344.perl.vars | 24 ++++++++++++++++++++++++ 344.python3.build | 1 - 344.python3.vars | 19 ------------------- 345.python3.build | 1 + 345.python3.vars | 19 +++++++++++++++++++ 345.rsync.build | 1 - 346.rsync.build | 1 + 346.sed.build | 1 - 347.sed.build | 1 + 347.tar.build | 1 - 348.tar.build | 1 + 348.tcsh.build | 1 - 349.tcsh.build | 1 + 999.tarballs.build | 2 +- build.vars | 11 ++++++++--- mc-4.8.17.local.patch | 22 ++++++++++++++++++++++ 36 files changed, 130 insertions(+), 102 deletions(-) create mode 120000 337.mc.build delete mode 120000 337.mksh.build delete mode 100644 337.mksh.vars create mode 120000 338.mksh.build create mode 100644 338.mksh.vars delete mode 120000 338.nano.build create mode 120000 339.nano.build delete mode 120000 339.netcat.build delete mode 100644 339.netcat.vars create mode 120000 340.netcat.build create mode 100644 340.netcat.vars delete mode 120000 340.openssh.build create mode 120000 341.openssh.build delete mode 120000 341.pacman.build create mode 120000 342.pacman.build delete mode 120000 342.patch.build create mode 120000 343.patch.build delete mode 120000 343.perl.build delete mode 100644 343.perl.vars create mode 120000 344.perl.build create mode 100644 344.perl.vars delete mode 120000 344.python3.build delete mode 100644 344.python3.vars create mode 120000 345.python3.build create mode 100644 345.python3.vars delete mode 120000 345.rsync.build create mode 120000 346.rsync.build delete mode 120000 346.sed.build create mode 120000 347.sed.build delete mode 120000 347.tar.build create mode 120000 348.tar.build delete mode 120000 348.tcsh.build create mode 120000 349.tcsh.build create mode 100644 mc-4.8.17.local.patch diff --git a/337.mc.build b/337.mc.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/337.mc.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/337.mksh.build b/337.mksh.build deleted file mode 120000 index 52bb82e5..00000000 --- a/337.mksh.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/337.mksh.vars b/337.mksh.vars deleted file mode 100644 index b7b4582f..00000000 --- a/337.mksh.vars +++ /dev/null @@ -1,33 +0,0 @@ -# -# . ./build.vars and set -o errexit are assumed. -# - -pkg_mksh_build() { - env CC="${PKG_CC_BUILD}" \ - CFLAGS="${PKG_CFLAGS_CONFIGURE} ${PKG_CFLAGS_BUILD}" \ - sh Build.sh; -}; - -pkg_mksh_install() { - tar -cpf - mksh |\ - tar -C ${PREFIX_LVL}/bin -xpf -; - if [ ! -f ${PREFIX_LVL}/etc/shells ]; then - mkdir -p ${PREFIX_LVL}/etc; - touch ${PREFIX_LVL}/etc/shells; - fi; - if ! grep -xq "/bin/mksh" ${PREFIX_LVL}/etc/shells; then - echo /bin/mksh >> ${PREFIX_LVL}/etc/shells; - fi; - if [ ! -d ${PREFIX_LVL}/share/doc/mksh/examples ]; then - mkdir -p ${PREFIX_LVL}/share/doc/mksh/examples; - fi; - tar -cpf - dot.mkshrc |\ - tar -C ${PREFIX_LVL}/share/doc/mksh/examples -xpf -; - if [ ! -d ${PREFIX_LVL}/share/man/man1 ]; then - mkdir -p ${PREFIX_LVL}/share/man/man1; - fi; - tar -cpf - mksh.1 |\ - tar -C ${PREFIX_LVL}/share/man/man1 -xpf -; -}; - -# vim:filetype=sh diff --git a/338.mksh.build b/338.mksh.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/338.mksh.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/338.mksh.vars b/338.mksh.vars new file mode 100644 index 00000000..b7b4582f --- /dev/null +++ b/338.mksh.vars @@ -0,0 +1,33 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_mksh_build() { + env CC="${PKG_CC_BUILD}" \ + CFLAGS="${PKG_CFLAGS_CONFIGURE} ${PKG_CFLAGS_BUILD}" \ + sh Build.sh; +}; + +pkg_mksh_install() { + tar -cpf - mksh |\ + tar -C ${PREFIX_LVL}/bin -xpf -; + if [ ! -f ${PREFIX_LVL}/etc/shells ]; then + mkdir -p ${PREFIX_LVL}/etc; + touch ${PREFIX_LVL}/etc/shells; + fi; + if ! grep -xq "/bin/mksh" ${PREFIX_LVL}/etc/shells; then + echo /bin/mksh >> ${PREFIX_LVL}/etc/shells; + fi; + if [ ! -d ${PREFIX_LVL}/share/doc/mksh/examples ]; then + mkdir -p ${PREFIX_LVL}/share/doc/mksh/examples; + fi; + tar -cpf - dot.mkshrc |\ + tar -C ${PREFIX_LVL}/share/doc/mksh/examples -xpf -; + if [ ! -d ${PREFIX_LVL}/share/man/man1 ]; then + mkdir -p ${PREFIX_LVL}/share/man/man1; + fi; + tar -cpf - mksh.1 |\ + tar -C ${PREFIX_LVL}/share/man/man1 -xpf -; +}; + +# vim:filetype=sh diff --git a/338.nano.build b/338.nano.build deleted file mode 120000 index 52bb82e5..00000000 --- a/338.nano.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/339.nano.build b/339.nano.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/339.nano.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/339.netcat.build b/339.netcat.build deleted file mode 120000 index 52bb82e5..00000000 --- a/339.netcat.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/339.netcat.vars b/339.netcat.vars deleted file mode 100644 index e9bd7e18..00000000 --- a/339.netcat.vars +++ /dev/null @@ -1,10 +0,0 @@ -# -# . ./build.vars and set -o errexit are assumed. -# - -pkg_netcat_install() { - tar -cpf - nc |\ - tar -C ${PREFIX_LVL}/bin -xpf -; -}; - -# vim:filetype=sh diff --git a/340.netcat.build b/340.netcat.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/340.netcat.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/340.netcat.vars b/340.netcat.vars new file mode 100644 index 00000000..e9bd7e18 --- /dev/null +++ b/340.netcat.vars @@ -0,0 +1,10 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_netcat_install() { + tar -cpf - nc |\ + tar -C ${PREFIX_LVL}/bin -xpf -; +}; + +# vim:filetype=sh diff --git a/340.openssh.build b/340.openssh.build deleted file mode 120000 index 52bb82e5..00000000 --- a/340.openssh.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/341.openssh.build b/341.openssh.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/341.openssh.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/341.pacman.build b/341.pacman.build deleted file mode 120000 index 52bb82e5..00000000 --- a/341.pacman.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/342.pacman.build b/342.pacman.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/342.pacman.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/342.patch.build b/342.patch.build deleted file mode 120000 index 52bb82e5..00000000 --- a/342.patch.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/343.patch.build b/343.patch.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/343.patch.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/343.perl.build b/343.perl.build deleted file mode 120000 index 52bb82e5..00000000 --- a/343.perl.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/343.perl.vars b/343.perl.vars deleted file mode 100644 index 23604795..00000000 --- a/343.perl.vars +++ /dev/null @@ -1,24 +0,0 @@ -# -# . ./build.vars and set -o errexit are assumed. -# - -pkg_perl_extract_post() { - git clone https://github.com/lalbornoz/perl-cross; - for _ppep_fname_src in $(find perl-cross -type f \ - -not -path perl-cross/.git/\* -not -name .gitignore); do - _ppep_fname_dst=perl-${PKG_VERSION}${_ppep_fname_src#perl-cross}; - if [ -f ${_ppep_fname_dst} ]; then - mv ${_ppep_fname_dst} ${_ppep_fname_dst}.orig; - fi; - if [ ! -d "$(dirname ${_ppep_fname_dst})" ]; then - mkdir -p $(dirname ${_ppep_fname_dst}); - fi; - cp ${_ppep_fname_src} ${_ppep_fname_dst}; - done; - for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do - PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}"; - done; - unset _ppep_fname_src _ppep_fname_dst _ppep_cflag; -}; - -# vim:filetype=sh diff --git a/344.perl.build b/344.perl.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/344.perl.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/344.perl.vars b/344.perl.vars new file mode 100644 index 00000000..23604795 --- /dev/null +++ b/344.perl.vars @@ -0,0 +1,24 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_perl_extract_post() { + git clone https://github.com/lalbornoz/perl-cross; + for _ppep_fname_src in $(find perl-cross -type f \ + -not -path perl-cross/.git/\* -not -name .gitignore); do + _ppep_fname_dst=perl-${PKG_VERSION}${_ppep_fname_src#perl-cross}; + if [ -f ${_ppep_fname_dst} ]; then + mv ${_ppep_fname_dst} ${_ppep_fname_dst}.orig; + fi; + if [ ! -d "$(dirname ${_ppep_fname_dst})" ]; then + mkdir -p $(dirname ${_ppep_fname_dst}); + fi; + cp ${_ppep_fname_src} ${_ppep_fname_dst}; + done; + for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do + PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}"; + done; + unset _ppep_fname_src _ppep_fname_dst _ppep_cflag; +}; + +# vim:filetype=sh diff --git a/344.python3.build b/344.python3.build deleted file mode 120000 index 52bb82e5..00000000 --- a/344.python3.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/344.python3.vars b/344.python3.vars deleted file mode 100644 index c987c798..00000000 --- a/344.python3.vars +++ /dev/null @@ -1,19 +0,0 @@ -# -# . ./build.vars and set -o errexit are assumed. -# - -pkg_python3_configure_pre() { - (cd ../${PKG_SUBDIR} && autoconf); - (unset BLDSHARED CC CFLAGS CPPFLAGS LDFLAGS; - mv config.cache ../${PKG_SUBDIR}/config.cache; - ../${PKG_SUBDIR}/configure; - make _FIP=Programs/host_freeze_importlib Programs/host_freeze_importlib \ - BUILDPYTHON=hostpython hostpython \ - PGEN=Parser/hostpgen Parser/hostpgen; - make distclean); - mv ../${PKG_SUBDIR}/config.cache .; - sed -i.orig '/^# autoconf/a\ -ac_cv_buggy_getaddrinfo=no' config.cache; -}; - -# vim:filetype=sh diff --git a/345.python3.build b/345.python3.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/345.python3.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/345.python3.vars b/345.python3.vars new file mode 100644 index 00000000..c987c798 --- /dev/null +++ b/345.python3.vars @@ -0,0 +1,19 @@ +# +# . ./build.vars and set -o errexit are assumed. +# + +pkg_python3_configure_pre() { + (cd ../${PKG_SUBDIR} && autoconf); + (unset BLDSHARED CC CFLAGS CPPFLAGS LDFLAGS; + mv config.cache ../${PKG_SUBDIR}/config.cache; + ../${PKG_SUBDIR}/configure; + make _FIP=Programs/host_freeze_importlib Programs/host_freeze_importlib \ + BUILDPYTHON=hostpython hostpython \ + PGEN=Parser/hostpgen Parser/hostpgen; + make distclean); + mv ../${PKG_SUBDIR}/config.cache .; + sed -i.orig '/^# autoconf/a\ +ac_cv_buggy_getaddrinfo=no' config.cache; +}; + +# vim:filetype=sh diff --git a/345.rsync.build b/345.rsync.build deleted file mode 120000 index 52bb82e5..00000000 --- a/345.rsync.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/346.rsync.build b/346.rsync.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/346.rsync.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/346.sed.build b/346.sed.build deleted file mode 120000 index 52bb82e5..00000000 --- a/346.sed.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/347.sed.build b/347.sed.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/347.sed.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/347.tar.build b/347.tar.build deleted file mode 120000 index 52bb82e5..00000000 --- a/347.tar.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/348.tar.build b/348.tar.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/348.tar.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/348.tcsh.build b/348.tcsh.build deleted file mode 120000 index 52bb82e5..00000000 --- a/348.tcsh.build +++ /dev/null @@ -1 +0,0 @@ -pkg.build \ No newline at end of file diff --git a/349.tcsh.build b/349.tcsh.build new file mode 120000 index 00000000..52bb82e5 --- /dev/null +++ b/349.tcsh.build @@ -0,0 +1 @@ +pkg.build \ No newline at end of file diff --git a/999.tarballs.build b/999.tarballs.build index 3d4829a6..0e8ca61a 100644 --- a/999.tarballs.build +++ b/999.tarballs.build @@ -57,7 +57,7 @@ log_msg info "Restored ${PREFIX_BASENAME}/lib."; log_msg info "Building source tarball..."; -tar -cpf - $(find tmp -mindepth 1 -maxdepth 2 \ +tar -cpf - $(find tmp -mindepth 2 -maxdepth 2 \ -not -path tmp/.\* \ -not -path tmp/\*.tar\* -not -path tmp/\*.tgz -not -path tmp/\*.txz \ -not -path tmp/ntctty/.git -not -path tmp/psxscl/.git) |\ diff --git a/build.vars b/build.vars index c720892a..0e00ca6e 100644 --- a/build.vars +++ b/build.vars @@ -8,9 +8,8 @@ # should not be forward slash-terminated. # -: ${PREFIX:=${HOME}/midipix}; - : ${ARCH:=nt64}; +: ${PREFIX:=${HOME}/midipix/${ARCH}}; : ${BUILD_STATUS_FINISHED_AT_CURRENT_FNAME:=${PREFIX}/BUILD_FINISHED_AT}; : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; : ${CFLAGS_DEFAULT:=-g2 -O0}; @@ -53,7 +52,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${WGET_ARGS:="--no-check-certificate"}; : ${WORKDIR:=${PREFIX}/tmp}; -: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libevent libfetch libffi libnbcompat libressl libz lua make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh tmux util_linux vim which xz zsh"}; +: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libevent libfetch libffi libnbcompat libressl libz lua make mc mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh tmux util_linux vim which xz zsh"}; : ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AR_INSTALL AUTOCONF AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_BUILD RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"}; : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0}; : ${PKG_LVL0_CONFIGURE_ARGS:="-C --disable-nls --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; @@ -248,6 +247,12 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_MAKE_VERSION:=3.81}; : ${PKG_MAKE_SHA256SUM:=f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8}; : ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.bz2}; +: ${PKG_MC_VERSION:=4.8.17}; +: ${PKG_MC_SHA256SUM:=0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d}; +: ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz}; +: ${PKG_MC_CFLAGS_BUILD_EXTRA:="-I${PREFIX_LVL3}/include -I${PREFIX_LVL3}/include/ncursesw"}; +: ${PKG_MC_CONFIGURE_ARGS_EXTRA:=--with-screen=ncurses}; +: ${PKG_MC_MAKEFLAGS_BUILD_EXTRA:=V=99}; : ${PKG_MKSH_VERSION:=R52c}; : ${PKG_MKSH_SHA256SUM:=c6341acea725103f782c14e994d6e12dabaee69e60fe1bc78603a41258d43ba6}; : ${PKG_MKSH_URL:=http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz}; diff --git a/mc-4.8.17.local.patch b/mc-4.8.17.local.patch new file mode 100644 index 00000000..23563790 --- /dev/null +++ b/mc-4.8.17.local.patch @@ -0,0 +1,22 @@ +--- mc-4.8.17/config/config.sub.orig 2016-05-07 16:13:48.000000000 +0000 ++++ mc-4.8.17/config/config.sub 2016-06-26 10:21:53.137825316 +0000 +@@ -804,6 +804,10 @@ + microblaze*) + basic_machine=microblaze-xilinx + ;; ++ midipix*) ++ basic_machine=x86_64-pc ++ os=-midipix ++ ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 +@@ -1384,7 +1388,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -- cgit v1.2.3