From patchwork Mon Feb 18 17:02:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 221421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B64872C0082 for ; Tue, 19 Feb 2013 04:03:52 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1361811833; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=i0xy5b9lK+VfqdG36LV3dHUsskw=; b=UKenugQg05c0RXw 6AjBPzTed2DAsbu/Gn+DopFGbSeOsg+o1b1a1P/M1rulGRNoS2ceZYB3fQEdQnwz f4mbldIHGeMAIyAG8qXFC+QrioD1C+TrQNn6Ltw0uMoYLhO3m1KDRCPu0gDehAOO 4WzXo71/bmgrHfkZXzmT2p7vgUG8= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=gRv2W0PhlYrxoG1erHsYaN0I5ORcTupWQGfC+QFjpDVlIEJ6r61iv4IfMOREfo D98LJry31yfQsRKffyUDWC7g/yok0orUXF0IC9ptHVplJRjAMoJKTc6it8wvrXrk xte7NTFktPCQVQxyOpdK8GTSu0fW++OUqx+8jITapdso8=; Received: (qmail 32271 invoked by alias); 18 Feb 2013 17:03:28 -0000 Received: (qmail 32115 invoked by uid 22791); 18 Feb 2013 17:03:24 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, 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; Mon, 18 Feb 2013 17:03:04 +0000 Received: from dslb-088-073-086-243.pools.arcor-ip.net ([88.73.86.243] 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 1U7U7L-0005zh-37; Mon, 18 Feb 2013 17:03:03 +0000 Message-ID: <51225EBE.1050509@ubuntu.com> Date: Mon, 18 Feb 2013 18:02:54 +0100 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: Richard Biener CC: GCC Patches , GCJ-patches , "libffi-discuss@sourceware.org" Subject: Re: [patch] [libffi] do not install libffi library, headers and documentation References: <511A35DC.7060207@ubuntu.com> In-Reply-To: Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Am 12.02.2013 13:45, schrieb Richard Biener: > On Tue, Feb 12, 2013 at 1:44 PM, Richard Biener > wrote: >> On Tue, Feb 12, 2013 at 1:30 PM, Matthias Klose 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 * 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