Get cross compilation to work

Rebased version of original patch by Ding Xiang Fei found in
https://github.com/NixOS/nixpkgs/pull/63866. This version applies in
alsa-firmware-1.2.1.

Co-authored-by: Ding Xiang Fei <dingxiangfei2009@users.noreply.github.com>
From: Matthew Bauer <mjbauer95@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/configure.ac b/configure.ac
index 642313863f4fb29eb01e2d4db469e4f55b34edc4..96c0068c5c53a0bee187d90c6758dbf3d1a2a37e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 AC_PREREQ(2.59)
 AC_INIT(alsa-firmware, 1.2.1)
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
+AC_PROG_CC_FOR_BUILD
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_HEADER_STDC

diff --git a/echoaudio/Makefile.am b/echoaudio/Makefile.am
index d18d792709e2270edf8b41ff8804ced49e335d00..52082008956395b210ea2946a1249183af7a25b4 100644 (file)
--- a/echoaudio/Makefile.am
+++ b/echoaudio/Makefile.am
@@ -75,6 +75,15 @@ hotplugfwdir =
 hotplugfw_DATA = 
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer DSP/LoaderDSP.c loader_dsp.fw
        ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw

diff --git a/emu/Makefile.am b/emu/Makefile.am
index b9271daa8f560f8d1a502d33b01e0a8a61f7805f..a32ce7880bad29f30da345bc103075b50af753c3 100644 (file)
--- a/emu/Makefile.am
+++ b/emu/Makefile.am
@@ -23,5 +23,14 @@ hotplugfwdir =
 hotplugfw_DATA = 
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer

diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am
index 48802a6f86da893995fe48ef58049e64480f1d96..d9d69a0f3ce15b9f750e23ec6e138eb7417095cd 100644 (file)
--- a/hdsploader/Makefile.am
+++ b/hdsploader/Makefile.am
@@ -32,5 +32,13 @@ EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \
             tobin.c
 CLEANFILES = $(dsp_hex_files)
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+tobin: $(tobin_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(dsp_hex_files): tobin
        ./tobin

diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
new file mode 100644 (file)
index 0000000..12cb005
--- /dev/null
+++ b/m4/ax_prog_cc_for_build.m4
@@ -0,0 +1,125 @@
+# ===========================================================================
+#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+#   This macro searches for a C compiler that generates native executables,
+#   that is a C compiler that surely is not a cross-compiler. This can be
+#   useful if you have to generate source code at compile-time like for
+#   example GCC does.
+#
+#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+#   The value of these variables can be overridden by the user by specifying
+#   a compiler with an environment variable (like you do for standard CC).
+#
+#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+#   substituted in the Makefile.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cpp], ac_build_cpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+
+save_cross_compiling=$cross_compiling
+save_ac_tool_prefix=$ac_tool_prefix
+cross_compiling=no
+ac_tool_prefix=
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_EXEEXT
+
+ac_tool_prefix=$save_ac_tool_prefix
+cross_compiling=$save_cross_compiling
+
+dnl Restore the old definitions
+dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([LDFLAGS])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([ac_cv_prog_CPP])dnl
+
+dnl Finally, set Makefile variables
+dnl
+BUILD_EXEEXT=$ac_build_exeext
+BUILD_OBJEXT=$ac_build_objext
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])

diff --git a/maestro3/Makefile.am b/maestro3/Makefile.am
index 7544f129237dbcf7a07a1a89022624f8bf486395..346ef1b38eae84f753f14d74b2b50958f7ea3bc1 100644 (file)
--- a/maestro3/Makefile.am
+++ b/maestro3/Makefile.am
@@ -17,5 +17,14 @@ hotplugfwdir =
 hotplugfw_DATA =
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer

diff --git a/sb16/Makefile.am b/sb16/Makefile.am
index 17eead9d42f38d7283942de1735b4548eaa2df52..8fe5ba4942820bbcd278e5790034773ff93173ab 100644 (file)
--- a/sb16/Makefile.am
+++ b/sb16/Makefile.am
@@ -18,5 +18,14 @@ hotplugfwdir =
 hotplugfw_DATA =
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer

diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am
index ca21494d68d849aeb8d2278f3512bb4e4e4e89a0..e67fd53469fba22a34fc394e14686a6fc89523a1 100644 (file)
--- a/vxloader/Makefile.am
+++ b/vxloader/Makefile.am
@@ -43,5 +43,14 @@ hotplugfwdir =
 hotplugfw_DATA = 
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+toxlx: $(toxlx_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 %.xlx: %.rbt toxlx
        ./toxlx < $< > $@

diff --git a/wavefront/Makefile.am b/wavefront/Makefile.am
index e8c9fe1067c69789c430994d5effa1b3b7475bb9..cac9889b9031f90c699248457d0db58d6a5598fe 100644 (file)
--- a/wavefront/Makefile.am
+++ b/wavefront/Makefile.am
@@ -17,5 +17,14 @@ hotplugfwdir =
 hotplugfw_DATA =
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer

diff --git a/ymfpci/Makefile.am b/ymfpci/Makefile.am
index 8795fbc9ead70e69c20f0852581164b6da506cb7..b6f505e12d006bab02e6083954957c50b7b93c7b 100644 (file)
--- a/ymfpci/Makefile.am
+++ b/ymfpci/Makefile.am
@@ -17,5 +17,14 @@ hotplugfwdir =
 hotplugfw_DATA =
 endif
 
+LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer: $(fw_writer_OBJECTS)
+       $(LINK_FOR_BUILD) $^ $(LDLIBS_FOR_BUILD) -o $@
+
 $(firmware_files): fw_writer
        ./fw_writer