mbox series

[0/4] Convert remaining submodules to meson, cleanup env var handling

Message ID 20201005135613.435932-1-pbonzini@redhat.com
Headers show
Series Convert remaining submodules to meson, cleanup env var handling | expand

Message

Paolo Bonzini Oct. 5, 2020, 1:56 p.m. UTC 
The main purpose of this series is to have a correct and consistent
handling of CFLAGS/CXXFLAGS/LDFLAGS environment variables:

- correct: avoid that the -pie flag, used for the compiler checks in
the configure script, ends up being passed to Meson if an LDFLAGS
environment variable exists (patch 3)

- consistent: ensure that CFLAGS that are set in the configure
script are persistent even if Meson is restarted; to do so,
make the configure script store them in the cross file it generates.

In order to avoid having to deal with recursive make, patches 1
and 2 integrate the Meson-based build system with the build of
embedded slirp and libfdt.  This follows the lead of Richard's
patches to do the same with Capstone.

Based-on: <20201003093851.324923-1-richard.henderson@linaro.org>
Supersedes: <20200923092617.1593722-1-pbonzini@redhat.com>

Paolo Bonzini (4):
  slirp: Convert Makefile bits to meson bits
  dtc: Convert Makefile bits to meson bits
  configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS
  configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson

 Makefile                                      |  28 +--
 configure                                     | 222 +++++-------------
 default-configs/targets/aarch64-softmmu.mak   |   1 +
 default-configs/targets/arm-softmmu.mak       |   1 +
 .../targets/microblaze-softmmu.mak            |   1 +
 .../targets/microblazeel-softmmu.mak          |   1 +
 default-configs/targets/mips64el-softmmu.mak  |   1 +
 default-configs/targets/ppc-softmmu.mak       |   1 +
 default-configs/targets/ppc64-softmmu.mak     |   1 +
 default-configs/targets/riscv32-softmmu.mak   |   1 +
 default-configs/targets/riscv64-softmmu.mak   |   1 +
 default-configs/targets/rx-softmmu.mak        |   1 +
 meson.build                                   | 164 +++++++++++--
 meson_options.txt                             |   6 +
 net/meson.build                               |   2 +-
 tests/qtest/meson.build                       |   6 +-
 16 files changed, 225 insertions(+), 213 deletions(-)

Comments

Richard Henderson Oct. 5, 2020, 5:15 p.m. UTC | #1 
On 10/5/20 8:56 AM, Paolo Bonzini wrote:
> The main purpose of this series is to have a correct and consistent

> handling of CFLAGS/CXXFLAGS/LDFLAGS environment variables:

> 

> - correct: avoid that the -pie flag, used for the compiler checks in

> the configure script, ends up being passed to Meson if an LDFLAGS

> environment variable exists (patch 3)

> 

> - consistent: ensure that CFLAGS that are set in the configure

> script are persistent even if Meson is restarted; to do so,

> make the configure script store them in the cross file it generates.

> 

> In order to avoid having to deal with recursive make, patches 1

> and 2 integrate the Meson-based build system with the build of

> embedded slirp and libfdt.  This follows the lead of Richard's

> patches to do the same with Capstone.

> 

> Based-on: <20201003093851.324923-1-richard.henderson@linaro.org>

> Supersedes: <20200923092617.1593722-1-pbonzini@redhat.com>

> 

> Paolo Bonzini (4):

>   slirp: Convert Makefile bits to meson bits

>   dtc: Convert Makefile bits to meson bits

>   configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS

>   configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson


Tested-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~