Patchwork [libffi] do not install libffi library, headers and documentation

login
register
mail settings
Submitter Matthias Klose
Date Feb. 12, 2013, 12:30 p.m.
Message ID <511A35DC.7060207@ubuntu.com>
Download mbox | patch
Permalink /patch/219840/
State New
Headers show

Comments

Matthias Klose - Feb. 12, 2013, 12:30 p.m.
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?

  Matthias
Richard Guenther - Feb. 12, 2013, 12:44 p.m.
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?)

Richard.

>   Matthias
>
Richard Guenther - Feb. 12, 2013, 12:45 p.m.
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

> Richard.
>
>>   Matthias
>>

Patch

2013-02-12  Matthias Klose  <doko@ubuntu.com>

	* Makefile.am: Do not install texinfo documentation and the
	libffi library.
	* include/Makefile.am: Do not install header files.
	* man/Makefile.am: Do not install man pages.
	* Makefile.in, include/Makefile.in, man/Makefile.in: Regenerate.

 
Index: Makefile.am
===================================================================
--- Makefile.am	(Revision 195973)
+++ Makefile.am	(Arbeitskopie)
@@ -49,7 +49,7 @@ 
 
 # Defines info, dvi, pdf and html targets
 MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
-info_TEXINFOS = doc/libffi.texi
+noinst_info_TEXINFOS = doc/libffi.texi
 
 # AM_CONDITIONAL on configure option --generated-files-in-srcdir
 if GENINSRC
@@ -130,8 +130,7 @@ 
 
 MAKEOVERRIDES=
 
-toolexeclib_LTLIBRARIES = libffi.la
-noinst_LTLIBRARIES = libffi_convenience.la
+noinst_LTLIBRARIES = libffi.la libffi_convenience.la
 
 libffi_la_SOURCES = src/prep_cif.c src/types.c \
 		src/raw_api.c src/java_raw_api.c src/closures.c
Index: include/Makefile.am
===================================================================
--- include/Makefile.am	(Revision 195973)
+++ include/Makefile.am	(Arbeitskopie)
@@ -9,4 +9,4 @@ 
 gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
-toollibffi_HEADERS = ffi.h ffitarget.h
+noinst_HEADERS = ffi.h ffitarget.h
Index: man/Makefile.am
===================================================================
--- man/Makefile.am	(Revision 195973)
+++ man/Makefile.am	(Arbeitskopie)
@@ -4,5 +4,5 @@ 
 
 EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3
 
-man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3
+noinst_man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3