From patchwork Wed Sep 1 13:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1523152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Wmq/wQg+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H045p134Dz9sSs for ; Wed, 1 Sep 2021 23:04:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 955C4385AC0A for ; Wed, 1 Sep 2021 13:04:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 955C4385AC0A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1630501482; bh=0ht2IH9vXquh9vUmyGUQWgC3U+vloJsQXG59bPXeQ38=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Wmq/wQg+B2quaJmNkqeT4RxsfvvGkUEfisLlvBOyEL8vvpVp3U2KSG6zBXOBrVSkz sX1QdaxafoEmS1suuFLaB4eZcvNC/zRsUL3I+GTLdARrLnXt7wOrHmjDoqiMxvOVdZ ssR6BEL47jQXjghPPh8BjxNXp/ye6dTJyqcVXYLA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by sourceware.org (Postfix) with ESMTPS id 581E93858411 for ; Wed, 1 Sep 2021 13:03:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 581E93858411 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4H043r0V8rzQkdF; Wed, 1 Sep 2021 15:03:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de To: gcc-patches@gcc.gnu.org Subject: [committed] libphobos: Don't add zlib when ENABLE_LIBDRUNTIME_ONLY Date: Wed, 1 Sep 2021 15:02:56 +0200 Message-Id: <20210901130256.975836-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4F7DB274 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, The D run-time library does not depend on zlib, so only include it in the library when Phobos is being built as well. Bootstrapped and regression tested on x86_64-linux-gnu/-m32/-mx32, and committed to mainline. Regards, Iain. --- libphobos/ChangeLog: * src/Makefile.am: Don't add zlib when ENABLE_LIBDRUNTIME_ONLY. * src/Makefile.in: Regenerate. --- libphobos/src/Makefile.am | 4 ++++ libphobos/src/Makefile.in | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am index f97ddccaca8..9f6251009f6 100644 --- a/libphobos/src/Makefile.am +++ b/libphobos/src/Makefile.am @@ -45,8 +45,12 @@ libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) +if ENABLE_LIBDRUNTIME_ONLY +libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la +else libgphobos_la_LIBADD = \ ../libdruntime/libgdruntime_convenience.la $(LIBZ) +endif libgphobos_la_DEPENDENCIES = \ ../libdruntime/libgdruntime_convenience.la libgphobos.spec diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in index 4f76e1077d5..f8b76486e6e 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in @@ -504,9 +504,10 @@ libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) -libgphobos_la_LIBADD = \ - ../libdruntime/libgdruntime_convenience.la $(LIBZ) +@ENABLE_LIBDRUNTIME_ONLY_FALSE@libgphobos_la_LIBADD = \ +@ENABLE_LIBDRUNTIME_ONLY_FALSE@ ../libdruntime/libgdruntime_convenience.la $(LIBZ) +@ENABLE_LIBDRUNTIME_ONLY_TRUE@libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la libgphobos_la_DEPENDENCIES = \ ../libdruntime/libgdruntime_convenience.la libgphobos.spec