vars/build.vars: adds ruby_host v2.3.0 in order to cross-compile ruby v2.3.0 across platforms.

subr/pkg_autoconf.subr: skip cp(1)ing etc/config.cache when ${PKG_BUILD_TYPE} is host.

2 files changed, 20 insertions, 11 deletions

diff --git a/subr/pkg_autoconf.subr b/subr/pkg_autoconf.subr
index 6ceec26b..810ec5a7 100644
--- a/subr/pkg_autoconf.subr
+++ b/subr/pkg_autoconf.subr
@@ -36,9 +36,11 @@ pkg_autoconf() {
 				fi;
 			done;
 		fi;
-		for __ in ${PKG_BUILD_DIR} ${PKG_CONFIG_CACHE_EXTRA}; do
-			build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${WORKDIR}/${__}/";
-		done;
+		if [ "${PKG_BUILD_TYPE}" != host ]; then
+			for __ in ${PKG_BUILD_DIR} ${PKG_CONFIG_CACHE_EXTRA}; do
+				build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${WORKDIR}/${__}/";
+			done;
+		fi;
 	fi;
 };
 
diff --git a/vars/build.vars b/vars/build.vars
index 53df9ce5..d5d397dc 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -258,7 +258,7 @@ LIB_PACKAGES_PACKAGES_LEAVES="
 expat libxml2 alsa_lib apr apr_util bzip2 curl libz libpng libjpeg_turbo tiff giflib
 libffi gdbm geoip pcre libffi_host glib_host glib gzip libarchive libatomic_ops
 libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
-libksba lua ncurses ncursestw ncursesw npth sqlite3 xz";
+libksba lua ncurses ncursestw ncursesw npth ruby_host sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm
@@ -436,6 +436,15 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_NPTH_SHA256SUM:=bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a};
 : ${PKG_NPTH_VERSION:=1.3};
 : ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
+: ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
+: ${PKG_RUBY_HOST_VERSION:=2.3.0};
+: ${PKG_RUBY_HOST_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_HOST_VERSION%.*}/ruby-${PKG_RUBY_HOST_VERSION}.tar.gz};
+: ${PKG_RUBY_HOST_BUILD_STEPS:="setup_env:always all:abstract disabled:always fetch:main extract:main patch_pre:main distclean:main build_dir:always autoconf:main configure:main clean:optional build:main install_pre:main install:main strip:main finish:always"};
+: ${PKG_RUBY_HOST_BUILD_TYPE:=host};
+: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
+: ${PKG_RUBY_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -L${PREFIX}/lib64"};
+: ${PKG_RUBY_HOST_CONFIGURE_ARGS:="-C --disable-nls --disable-install-rdoc --prefix=${PREFIX} --with-out-ext=fiddle"};
+: ${PKG_RUBY_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
 : ${PKG_SQLITE3_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615};
 : ${PKG_SQLITE3_VERSION:=3160200};
 : ${PKG_SQLITE3_URL:=https://sqlite.org/2017/sqlite-autoconf-${PKG_SQLITE3_VERSION}.tar.gz};
@@ -871,13 +880,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_RSYNC_VERSION:=3.1.2};
 : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz};
 : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-popt --with-included-zlib};
-if [ -n "$(which ruby 2>/dev/null)" ]; then
-	: ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
-	: ${PKG_RUBY_VERSION:=2.3.0};
-	: ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
-	: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle"};
-	: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
-fi;
+: ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
+: ${PKG_RUBY_VERSION:=2.3.0};
+: ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
+: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle"};
+: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_RXVT_UNICODE_SHA256SUM:=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd};
 : ${PKG_RXVT_UNICODE_VERSION:=9.22};
 : ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};