Re: [patch] [libffi] do not install libffi library, headers and documentation

[Matthias Klose <doko@ubuntu.com>]

[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]

Am 12.02.2013 13:45, schrieb Richard Biener:
> On Tue, Feb 12, 2013 at 1:44 PM, Richard Biener
> <richard.guenther@gmail.com> wrote:
>> On Tue, Feb 12, 2013 at 1:30 PM, Matthias Klose <doko@ubuntu.com> wrote:
>>> The libffi library, headers and documentation are still installed, although
>>> libffi provides separate releases for a long time.  So do not install these
>>> anymore as part of a GCC install.  Tested with a build and an install with go
>>> and java enabled (both using libffi_convenience). Ok for the trunk?
>>
>> openSUSE is using the GCC provided libffi, so no, this is not ok (not at this
>> stage anyway).  Also proper not-installing libffi would work by disabling
>> the maybe-install-target-libffi at the toplevel, not changing libffi makfiles
>> (which are supposed to be imported from upstream, no?)
> 
> Thus, add no_install= true; to the libffi target module

updated patch attached, checked with a make install that no ffi headers and
libraries are installed. If not ok for 4.8, ok for 4.9 when it opens?

  Matthias


[-- Attachment #2: noinst.diff --]
[-- Type: text/x-diff, Size: 1720 bytes --]


	* Makefile.def (target_modules): Don't install libffi.
	* Makefile.in: Regenerate.

Index: Makefile.def
===================================================================
--- Makefile.def	(Revision 196115)
+++ Makefile.def	(Arbeitskopie)
@@ -138,7 +138,7 @@
                    missing=maintainer-clean; };
 target_modules = { module= winsup; };
 target_modules = { module= libgloss; no_check=true; };
-target_modules = { module= libffi; };
+target_modules = { module= libffi; no_install=true; };
 target_modules = { module= libjava; raw_cxx=true;
                    extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
 target_modules = { module= zlib; };
Index: Makefile.in
===================================================================
--- Makefile.in	(Revision 196115)
+++ Makefile.in	(Arbeitskopie)
@@ -38710,13 +38710,8 @@
 @if target-libffi
 maybe-install-target-libffi: install-target-libffi
 
-install-target-libffi: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+# Dummy target for uninstallable.
+install-target-libffi:
 
 @endif target-libffi
 
@@ -38725,13 +38720,8 @@
 @if target-libffi
 maybe-install-strip-target-libffi: install-strip-target-libffi
 
-install-strip-target-libffi: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+# Dummy target for uninstallable.
+install-strip-target-libffi:
 
 @endif target-libffi