From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16140 invoked by alias); 12 Feb 2013 12:30:35 -0000 Received: (qmail 16109 invoked by uid 22791); 12 Feb 2013 12:30:33 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_LOW,TBIRD_SPOOF,TW_BF X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 12 Feb 2013 12:30:27 +0000 Received: from dslb-088-073-112-101.pools.arcor-ip.net ([88.73.112.101] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1U5F0D-0002bN-Jr; Tue, 12 Feb 2013 12:30:25 +0000 Message-ID: <511A35DC.7060207@ubuntu.com> Date: Tue, 12 Feb 2013 12:30:00 -0000 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130105 Thunderbird/17.0.2 MIME-Version: 1.0 To: GCC Patches CC: GCJ-patches , "libffi-discuss@sourceware.org" Subject: [patch] [libffi] do not install libffi library, headers and documentation Content-Type: multipart/mixed; boundary="------------030103030806050306050001" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2013-q1/txt/msg00012.txt.bz2 This is a multi-part message in MIME format. --------------030103030806050306050001 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Content-length: 311 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 --------------030103030806050306050001 Content-Type: text/x-diff; name="noinst.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="noinst.diff" Content-length: 1775 2013-02-12 Matthias Klose * 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 --------------030103030806050306050001--