From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8A4TJRddzmLPLgEAbAwnHQ (envelope-from ) for ; Wed, 13 Jul 2022 07:50:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mJziJBddzmJ6xwAAauVa8A (envelope-from ) for ; Wed, 13 Jul 2022 07:50:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 727403D070 for ; Wed, 13 Jul 2022 07:50:15 +0200 (CEST) Received: from localhost ([::1]:38250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBVGI-0001IQ-8A for larch@yhetil.org; Wed, 13 Jul 2022 01:50:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBVG6-0001I8-Sl for guix-patches@gnu.org; Wed, 13 Jul 2022 01:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBVG6-0005FR-AC for guix-patches@gnu.org; Wed, 13 Jul 2022 01:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBVG6-000139-6Y for guix-patches@gnu.org; Wed, 13 Jul 2022 01:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56504] [PATCH] Mingw support for zlib Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Jul 2022 05:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 56504@debbugs.gnu.org Received: via spool by 56504-submit@debbugs.gnu.org id=B56504.16576913633950 (code B ref 56504); Wed, 13 Jul 2022 05:50:02 +0000 Received: (at 56504) by debbugs.gnu.org; 13 Jul 2022 05:49:23 +0000 Received: from localhost ([127.0.0.1]:44271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBVFT-00011e-0O for submit@debbugs.gnu.org; Wed, 13 Jul 2022 01:49:23 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBVFQ-00011R-Ur for 56504@debbugs.gnu.org; Wed, 13 Jul 2022 01:49:22 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4LjRWx16T7z1LZX2; Wed, 13 Jul 2022 07:49:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4LjRWx16T7z1LZX2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1657691357; bh=CMN9kVdb5JxeagXyvq3him3TLE2s8M8qtIfE5hruZPQ=; h=Subject:From:To:Date:In-Reply-To:References:From; b=ad5oMSQbBdD+STBKIrsaCA3l5MwcHNu0doDusGUonjnpXnxwbMHWVs9ftTfj0z2PP R84uDxjCPiB9Un4HvFu70Vjh6TGDTDYCRR6510X/dt+ltMLj5Rc+sL+5pfjIR7C20Q 5wuqiA2biH3xJKkKiBgXBdHpU0WgTBMDg6e88qDk= Message-ID: From: Liliana Marie Prikler Date: Wed, 13 Jul 2022 07:49:17 +0200 In-Reply-To: <29fa1e573d51f351796ba22d7344d9738d71c9be.camel@planete-kraus.eu> References: <9418154f0a4f8c2b06b1b5bbce8df570ec4028de.camel@planete-kraus.eu> <29fa1e573d51f351796ba22d7344d9738d71c9be.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657691415; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CMN9kVdb5JxeagXyvq3him3TLE2s8M8qtIfE5hruZPQ=; b=BBE4iMePPTQUF43lhCaUTSMqzupVq/i+AbbSayM4UysGo+2MWVmw9DEGT61S3w4TQl81kh 00B7zVyG8FKHLlXMHGffdmdQycS7ZfW8A605Qm7/PHV5DOJeR44G7jSZRZsTs+py9mTHEq WDag04N1ASwzjiKn5XTVrWry4Ev6+P3WAOM9gwV7Rx30esEAvo5Gf9rcN1TAWkMftUJIhv 2VMSu7+bkt4VGg8TCtuIk8uFbkuA4lXyF+n9RZyxqSdmo7rV8jJNkzWSCvO18sBH1Mfnwe KnH/vbSddGzZlO7VOGGpMFJvkVDU+duJ2zpSlr2rVTsZXbYSEwnuSy9wJohc4A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657691415; a=rsa-sha256; cv=none; b=VhQpnnWcirv1eVkciCgYcg6rB51wAnCSUUP2OlPY1M1kT6amEgwEZ5JbW8m94X+WaAt8r0 slIm5gHq93KyUkFDNWZ8PNMPUQNADq/ldohImR5/6e4myHcGqphMloE0dyd+FtRt06vlMJ vYsUlQB6bJEAUxAbRo6WwkM5pgM2EORaihQ88zEtzVexTAgjk2Y4DGdM8c6ZSNT8T8k//K ubG/qlWu+AkmijlcRYnlxhwaRp8v4WyeHokyYvTGpAbyaj5QkXy12CNVvHymsOdqraWhlR Kaq/tTL7A8NuiAiWMTiwnjyZ9chv12/NEwRk11pZfuOQ2i3Iv+YVzus+bgvf0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=ad5oMSQb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=ad5oMSQb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 727403D070 X-Spam-Score: 5.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: BD3NhSuTaezi Am Dienstag, dem 12.07.2022 um 18:45 +0200 schrieb Vivien Kraus: > Le mardi 12 juillet 2022 à 08:07 +0200, Liliana Marie Prikler a > écrit : > > Am Dienstag, dem 12.07.2022 um 01:53 +0200 schrieb Vivien Kraus: > > > > > +               ,@(if (and (%current-target-system) > > > +                          (string-suffix? "-w64-mingw32" > > > (%current- > > > target-system))) > > I'm pretty sure there's an abbreviation for this like target-mingw? > Precisely! Fixed it, thank you. > > > > +                     `((substitute* "win32/Makefile.gcc" > > > +                         (("PREFIX =") > > > +                          (string-append "PREFIX = " ,(%current- > > > target-system) "-")) > > > +                         (("prefix \\?= /usr/local") > > > +                          (string-append "prefix ?= " out)) > > > +                         (("# BINARY_PATH, INCLUDE_PATH and > > > LIBRARY_PATH must be set.") > > > +                          "\ > > > +BINARY_PATH = $(prefix)/bin > > > +INCLUDE_PATH = $(prefix)/include > > > +LIBRARY_PATH = $(prefix)/lib")) > > > +                       (rename-file "win32/Makefile.gcc" > > > "Makefile")) > > I think these can be conditionally added to #:make-flags > I did it for all but prefix, because I have to have the output path. > Is there a way to get it from within the make-flags? With the gexp-style you'd write #$output, otherwise ,(assoc-ref %build- outputs "out"). > > > +                     `((invoke "./configure" > > > +                               (string-append "--prefix=" > > > out))))))) > > > > > +         ,@(if (and (%current-target-system) > > > +                    (string-suffix? "-mingw32" (%current-target- > > > system))) > > > +               `(add-after 'install 'install-mingw-shared > > > +                  (lambda* (#:key make-flags #:allow-other-keys) > > > +                    (apply invoke "make" > > > +                           (append make-flags > > > +                                   '("install" > > > "SHARED_MODE=1"))))) > > SHARED_MODE might likewise be conditionally added to #:make-flags. > I get both the DLL loader and the DLL in the default output, and the > static lib in the static output, so it works. Oh, so you mean the static output should be built without SHARED_MODE? Cheers