summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 15:22:37 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 15:22:37 +0000
commit452c35632a14e2a15005c3aeda23cd2c9a2ae60e (patch)
treee570cd534374b321c49691f1142a67fcad39187e
parentc96530755d6f98cc1ddd626cc61efbd76cfed931 (diff)
downloadmidipix_build-452c35632a14e2a15005c3aeda23cd2c9a2ae60e.tar.bz2
midipix_build-452c35632a14e2a15005c3aeda23cd2c9a2ae60e.tar.xz
build.sh:buildp_dispatch(): correctly filter ${_build_groups_lc} in the absence of -D rpm.
groups/0[23]0.host_{deps_rpm,toolchain}.group: renamed. groups/020.host_deps_rpm.group:libarchive_host:${PKG_CFLAGS_CONFIGURE}: configure w/ -I${PREFIX}/include.
-rwxr-xr-xbuild.sh2
-rw-r--r--groups/020.host_deps_rpm.group (renamed from groups/015.host_deps_rpm.group)1
-rw-r--r--groups/030.host_toolchain.group (renamed from groups/020.host_toolchain.group)0
3 files changed, 2 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index d6ee03ce..05c2af13 100755
--- a/build.sh
+++ b/build.sh
@@ -13,7 +13,7 @@ buildp_dispatch() {
ex_rtl_log_env_vars "build (global)" ${DEFAULT_LOG_ENV_VARS};
_build_groups_lc="${BUILD_GROUPS:-${GROUPS_DEFAULT}}";
if ! ex_rtl_lmatch "${ARG_DIST}" , rpm; then
- _build_groups_lc="$(ex_rtl_lfilter "${_build_groups_lc}" "host_tools_rpm")";
+ _build_groups_lc="$(ex_rtl_lfilter "${_build_groups_lc}" "host_deps_rpm")";
fi;
if [ "${ARG_RESTART}" = "LAST" ]; then
if [ -n "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]\
diff --git a/groups/015.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index 8eae9ab8..694147b8 100644
--- a/groups/015.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -10,6 +10,7 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}";
: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e};
: ${PKG_LIBARCHIVE_HOST_VERSION:=3.3.3};
: ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.gz};
+: ${PKG_LIBARCHIVE_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
: ${PKG_LIBARCHIVE_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};
: ${PKG_LMDB_HOST_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};
: ${PKG_LMDB_HOST_IN_TREE:=1};
diff --git a/groups/020.host_toolchain.group b/groups/030.host_toolchain.group
index 17c1a0c1..17c1a0c1 100644
--- a/groups/020.host_toolchain.group
+++ b/groups/030.host_toolchain.group