From patchwork Wed Nov 30 12:08:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 701000 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tTK2x6TsRz9t1Q for ; Wed, 30 Nov 2016 23:09:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="AuRqQiZY"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=Fk+NVPBaNvdjfcHHG qcvSgpjgrQ8+Mt8X7RjDf9rgZzSmWnrFrcCmi0v2bo0ypILTxPXShynJOjKC7Zgr 20yEn1d35HpmirsAMoIQkj51Ha0qzy1lCPVd6vh0RnH7RTuk+Ox8mwuQO2ID2rNI B9HEtLUGt3AgK2TYOXFLTJSkZE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=AtD4ISDUDcnMth6o8TLmeO9 CFc4=; b=AuRqQiZYbQZ7VquApgh9LkdR9NMe6Y1Pdy1u1pQfKBi7wR+Wi0g/XyJ yHMqBfvkS103v/AwVUCuvGVK+8fj63h/DLw3iA9Lb/Ub1Zle3y8JzpuhWa50CDyh DUfJJ9vonbnG9AfSvgr8y8/1Pl9yOjcKZechVoDHjuYzk9c5tgKM= Received: (qmail 82618 invoked by alias); 30 Nov 2016 12:08:48 -0000 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 Received: (qmail 82591 invoked by uid 89); 30 Nov 2016 12:08:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=sk:enable_, bdw X-HELO: einhorn.in-berlin.de Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 Nov 2016 12:08:37 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.178.26] (ip5f5af460.dynamic.kabel-deutschland.de [95.90.244.96]) (authenticated bits=0) by einhorn.in-berlin.de (8.14.4/8.14.4/Debian-8+deb8u1) with ESMTP id uAUC8ZSx015482 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 30 Nov 2016 13:08:35 +0100 Subject: Re: [patch] boehm-gc removal and libobjc changes to build with an external bdw-gc To: Richard Biener References: <98216026-e0e2-f253-0346-94071d7dc5c7@ubuntu.com> <20161130105256.GO3541@tucnak.redhat.com> <44251aa7-23b7-3e30-55fc-8c940d51ed23@ubuntu.com> Cc: Jakub Jelinek , Andreas Schwab , GCC Patches , Andrew Pinski , Nicola Pero , Jeff Law From: Matthias Klose Message-ID: Date: Wed, 30 Nov 2016 13:08:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: On 30.11.2016 12:38, Richard Biener wrote: > On Wed, Nov 30, 2016 at 12:30 PM, Matthias Klose wrote: >> There's one more fix needed for the case of only having the pkg-config module >> installed when configuring with --enable-objc-gc. We can't use PKG_CHECK_MODULES >> directly because the pkg.m4 macros choke on the dash in the module name. Thus >> setting the CFLAGS and LIBS directly. Ok to install? > > Why not fix pkg.m4? as discussed on irc, now avoiding the use pkg-config, and assuming that libgc is available in default locations when no --with-target-bdw-gc flags are given. Checked with --enable-objc-gc and --enabled-objc-gc=auto. Ok to install? Matthias * configure.ac: Don't use pkg-config to check for bdw-gc. config/ * pkg.m4: Remove. libobjc/ * configure.ac: Don't use pkg-config to check for bdw-gc. gcc/ * doc/install.texi: Don't use pkg-config to check for bdw-gc. Index: configure.ac =================================================================== --- configure.ac (Revision 243006) +++ configure.ac (Arbeitskopie) @@ -29,7 +29,6 @@ m4_include([ltversion.m4]) m4_include([lt~obsolete.m4]) m4_include([config/isl.m4]) -m4_include([config/pkg.m4]) AC_INIT(move-if-change) AC_PREREQ(2.64) @@ -2076,10 +2075,8 @@ case ,${enable_languages},:${enable_objc_gc} in *,objc,*:yes|*,objc,*:auto) AC_MSG_CHECKING([for bdw garbage collector]) if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then - dnl no bdw-gw options, fall back to the bdw-gc pkg-config module - PKG_CHECK_EXISTS(bdw-gc, - AC_MSG_RESULT([using bdw-gc pkg-config module]), - AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found])) + dnl no bdw-gw options, assume default locations + AC_MSG_RESULT([using bdw-gc in default locations]) else dnl bdw-gw options, first error checking, complete checking in libobjc if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then Index: gcc/doc/install.texi =================================================================== --- gcc/doc/install.texi (Revision 243006) +++ gcc/doc/install.texi (Arbeitskopie) @@ -2204,8 +2204,7 @@ @option{--with-target-bdw-gc-lib} must always be specified together for each multilib variant and they take precedence over @option{--with-target-bdw-gc}. If none of these options are -specified, the values are taken from the @command{pkg-config} -@samp{bdw-gc} module. +specified, the library is assumed in default locations. @end table @html Index: libobjc/configure.ac =================================================================== --- libobjc/configure.ac (Revision 243006) +++ libobjc/configure.ac (Arbeitskopie) @@ -18,8 +18,6 @@ #along with GCC; see the file COPYING3. If not see #. -m4_include([../config/pkg.m4]) - AC_PREREQ(2.64) AC_INIT(package-unused, version-unused,, libobjc) AC_CONFIG_SRCDIR([objc/objc.h]) @@ -223,10 +221,9 @@ *) AC_MSG_CHECKING([for bdw garbage collector]) if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then - dnl no bdw-gw options, fall back to the bdw-gc pkg-config module - PKG_CHECK_EXISTS(bdw-gc, - AC_MSG_RESULT([using bdw-gc pkg-config module]), - AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found])) + dnl no bdw-gw options, assuming bdw-gc in default locations + BDW_GC_CFLAGS= + BDW_GC_LIBS="-lgc" else dnl bdw-gw options passed by configure flags if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then