Message ID | 20221231141610.11021-1-iain@sandoe.co.uk |
---|---|
State | New |
Headers | show |
Series | configure: Do not build the unused libffi shared library. | expand |
> Am 31.12.2022 um 15:16 schrieb Iain Sandoe via Gcc-patches <gcc-patches@gcc.gnu.org>: > > Tested on i686/powerpc/x86_64/aarch64 Darwin, x86_64-linux-gnu, > OK for master? Ok Richard > thanks > Iain > > --- 8< --- > > We do not use the shared libffi library, nor do we install it. > However, on at least Darwin, the shared version will be picked > up for testing, so it is preferrable not to build it. > > Signed-off-by: Iain Sandoe <iain@sandoe.co.uk> > > ChangeLog: > > * Makefile.def: Do not build shared libffi. > * Makefile.in: Regenerate. > --- > Makefile.def | 3 ++- > Makefile.in | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Makefile.def b/Makefile.def > index 86d15f1982f..35e994eb77e 100644 > --- a/Makefile.def > +++ b/Makefile.def > @@ -181,7 +181,8 @@ target_modules = { module= libtermcap; no_check=true; > missing=maintainer-clean; }; > target_modules = { module= winsup; }; > target_modules = { module= libgloss; no_check=true; }; > -target_modules = { module= libffi; no_install=true; }; > +target_modules = { module= libffi; no_install=true; > + extra_configure_flags='--disable-shared --with-pic'; }; > target_modules = { module= zlib; bootstrap=true; }; > target_modules = { module= rda; }; > target_modules = { module= libada; }; > diff --git a/Makefile.in b/Makefile.in > index d66e6208fa2..06a9398e172 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -55467,7 +55467,7 @@ configure-target-libffi: > $$s/$$module_srcdir/configure \ > --srcdir=$${topdir}/$$module_srcdir \ > $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ > - --target=${target_alias} \ > + --target=${target_alias} --disable-shared --with-pic \ > || exit 1 > @endif target-libffi > > -- > 2.37.1 (Apple Git-137.1) >
diff --git a/Makefile.def b/Makefile.def index 86d15f1982f..35e994eb77e 100644 --- a/Makefile.def +++ b/Makefile.def @@ -181,7 +181,8 @@ target_modules = { module= libtermcap; no_check=true; missing=maintainer-clean; }; target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; -target_modules = { module= libffi; no_install=true; }; +target_modules = { module= libffi; no_install=true; + extra_configure_flags='--disable-shared --with-pic'; }; target_modules = { module= zlib; bootstrap=true; }; target_modules = { module= rda; }; target_modules = { module= libada; }; diff --git a/Makefile.in b/Makefile.in index d66e6208fa2..06a9398e172 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55467,7 +55467,7 @@ configure-target-libffi: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} \ + --target=${target_alias} --disable-shared --with-pic \ || exit 1 @endif target-libffi
Tested on i686/powerpc/x86_64/aarch64 Darwin, x86_64-linux-gnu, OK for master? thanks Iain --- 8< --- We do not use the shared libffi library, nor do we install it. However, on at least Darwin, the shared version will be picked up for testing, so it is preferrable not to build it. Signed-off-by: Iain Sandoe <iain@sandoe.co.uk> ChangeLog: * Makefile.def: Do not build shared libffi. * Makefile.in: Regenerate. --- Makefile.def | 3 ++- Makefile.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)