From 168e556aba2831a9217ca492619466419c6c8eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 11 Apr 2021 12:54:46 +0100
Subject: Integrate w/ sofort's ${NATIVE_{C,CXX,LD}FLAGS}.

groups/{000.host_tools,010.host_deps,200.native_packages}.group:${*_SOFORT_NATIVE_C{,XX}FLAGS}: build w/ -I${PREFIX}/include.
groups/010.host_deps.group:python[23]_host:${PKG_ENV_VARS_EXTRA}: updated.
groups/010.host_deps.group:python[23]_host:${PKG_SOFORT_FORCE}: force calling ex_pkg_env_sofort().
groups/010.host_deps.group:python3_host:${PKG_SOFORT_NATIVE_CC}: build w/ ${DEFAULT_HOST_CC} (via midipix.)
groups/221.native_packages_dev.group:python[23]:${PKG_SOFORT_FORCE}: force calling ex_pkg_env_sofort().
groups/221.native_packages_dev.group:${PKG_{ENV_VARS_EXTRA,SOFORT_NATIVE_CFLAGS_EXTRA}}: updated.
midipix.env:${DEFAULT_BUILD_VARS}: adds SOFORT_NATIVE_{{CC,CXX,LD},{C,CXX,LD}FLAGS{,_EXTRA}}.
patches/python3_host-3.6.3.local.patch: removes obsolete patch.
subr/ex_pkg_env.subr:ex_pkg_env_sofort(): initial implementation.
subr/ex_pkg_env.subr:ex_pkg_env(): call ex_pkg_env_sofort() initially.
subr/pkg_configure_autotools.subr: call ex_pkg_env_sofort().
---
 groups/000.host_tools.group          |  3 +++
 groups/010.host_deps.group           | 10 ++++++++--
 groups/200.native_packages.group     |  3 +++
 groups/221.native_packages_dev.group |  6 ++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'groups')

diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group
index 45b104b6..febf51a8 100644
--- a/groups/000.host_tools.group
+++ b/groups/000.host_tools.group
@@ -8,6 +8,9 @@ HOST_TOOLS_PACKAGES="
 autoconf_host automake_host gettext_tiny_host install_strip_host
 libtool_host m4_host pkgconf_host slibtool_host tpax_host";
 HOST_TOOLS_PREFIX="${PREFIX}";
+HOST_TOOLS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include";
+HOST_TOOLS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include";
+HOST_TOOLS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
 : ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"};
 : ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684};
 : ${PKG_AUTOCONF_HOST_VERSION:=2.69};
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 3b5d4647..40ead499 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -19,6 +19,9 @@ perk_host python2_host python3_host ruby_host sbsigntools_host
 sqlite3_host texinfo_host tzdb_host util_linux_host xz_host";
 HOST_DEPS_PKG_CONFIG="${PREFIX}/bin/pkgconf";
 HOST_DEPS_PREFIX="${PREFIX}";
+HOST_DEPS_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include";
+HOST_DEPS_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include";
+HOST_DEPS_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
 : ${PKG_BINUTILS_BUILD_DEPENDS:="texinfo_host"};
 : ${PKG_BINUTILS_BUILD_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_BUILD_VERSION:=2.24.51};
@@ -198,7 +201,8 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PYTHON2_HOST_BUILD_DIR:=build/python2};
 : ${PKG_PYTHON2_HOST_CONFIGURE:=build/sbpython2/configure};
 : ${PKG_PYTHON2_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=${PREFIX}"};
-: ${PKG_PYTHON2_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include:NATIVE_LDFLAGS=-Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_PYTHON2_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"};
+: ${PKG_PYTHON2_HOST_SOFORT_FORCE:=1};
 : ${PKG_PYTHON2_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"};
 : ${PKG_PYTHON2_HOST_SUBDIR:=Python-${PKG_PYTHON2_HOST_VERSION}};
 : ${PKG_PYTHON3_HOST_DEPENDS:="bzip2_host expat_host gdbm_host libffi_host libreadline_host libressl_host libz_host ncurses_host ncursesw_host sqlite3_host xz_host"};
@@ -210,9 +214,11 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PYTHON3_HOST_BUILD_DIR:=build/python3};
 : ${PKG_PYTHON3_HOST_CONFIGURE:=build/sbpython3/configure};
 : ${PKG_PYTHON3_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_HOST_VERSION} --prefix=${PREFIX}"};
-: ${PKG_PYTHON3_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include:NATIVE_LDFLAGS=-Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_PYTHON3_HOST_ENV_VARS_EXTRA:="PYCOMPILE_CFLAGS=-I${PREFIX}/include"};
 : ${PKG_PYTHON3_HOST_INSTALL_FILES:="@python3=bin/python"};
 : ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"};
+: ${PKG_PYTHON3_HOST_SOFORT_FORCE:=1};
+: ${PKG_PYTHON3_HOST_SOFORT_NATIVE_CC:="${DEFAULT_HOST_CC}"};
 : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}};
 : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
 : ${PKG_RUBY_HOST_VERSION:=2.3.0};
diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group
index 886fab53..bc4a5061 100644
--- a/groups/200.native_packages.group
+++ b/groups/200.native_packages.group
@@ -12,5 +12,8 @@ NATIVE_PACKAGES_PACKAGES="";
 NATIVE_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
+NATIVE_PACKAGES_SOFORT_NATIVE_CFLAGS="-I${PREFIX}/include";
+NATIVE_PACKAGES_SOFORT_NATIVE_CXXFLAGS="-I${PREFIX}/include";
+NATIVE_PACKAGES_SOFORT_NATIVE_LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
 
 # vim:filetype=sh textwidth=0
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index dde440bc..f14a4413 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -111,7 +111,8 @@ patch patchutils perl python2 python3 ruby sbsigntools smallbasic tk")";
 : ${PKG_PYTHON2_BUILD_DIR:=build/python2};
 : ${PKG_PYTHON2_CONFIGURE:=build/sbpython2/configure};
 : ${PKG_PYTHON2_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_PYTHON2_ENV_VARS_EXTRA:="NATIVE_CFLAGS=-std=c99 -D_XOPEN_SOURCE=700 -I${PREFIX}/include:NATIVE_LDFLAGS=-L${PREFIX}/lib -ltinfo -Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_PYTHON2_SOFORT_FORCE:=1};
+: ${PKG_PYTHON2_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"};
 : ${PKG_PYTHON2_SUBDIR:=Python-${PKG_PYTHON2_VERSION}};
 : ${PKG_PYTHON3_DEPENDS:="bzip2 curl expat gdbm libffi libreadline libressl libz ncursesw sqlite3 xz"};
 : ${PKG_PYTHON3_SHA256SUM:=ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91};
@@ -122,7 +123,8 @@ patch patchutils perl python2 python3 ruby sbsigntools smallbasic tk")";
 : ${PKG_PYTHON3_BUILD_DIR:=build/python3};
 : ${PKG_PYTHON3_CONFIGURE:=build/sbpython3/configure};
 : ${PKG_PYTHON3_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_PYTHON3_ENV_VARS_EXTRA:="NATIVE_CFLAGS=-std=c99 -D_XOPEN_SOURCE=700 -I${PREFIX}/include:NATIVE_LDFLAGS=-L${PREFIX}/lib -ltinfo -Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_PYTHON3_SOFORT_FORCE:=1};
+: ${PKG_PYTHON3_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"};
 : ${PKG_PYTHON3_INSTALL_FILES:="@python3=bin/python"};
 : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
 : ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
-- 
cgit v1.2.3