From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 qDMdNKnizmIveQAAbAwnHQ (envelope-from ) for ; Wed, 13 Jul 2022 17:20:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6HcCNKnizmKYmwAA9RJhRA (envelope-from ) for ; Wed, 13 Jul 2022 17:20:09 +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 7820D14FEA for ; Wed, 13 Jul 2022 17:20:09 +0200 (CEST) Received: from localhost ([::1]:36214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBe9o-0005Ay-IJ for larch@yhetil.org; Wed, 13 Jul 2022 11:20:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBe9j-0005Ai-0D for guix-patches@gnu.org; Wed, 13 Jul 2022 11:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBe9i-0003fh-JU for guix-patches@gnu.org; Wed, 13 Jul 2022 11:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBe9i-000543-FO for guix-patches@gnu.org; Wed, 13 Jul 2022 11:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56504] [PATCH] Mingw support for zlib Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Jul 2022 15:20: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: Liliana Marie Prikler , 56504@debbugs.gnu.org Received: via spool by 56504-submit@debbugs.gnu.org id=B56504.165772558519439 (code B ref 56504); Wed, 13 Jul 2022 15:20:02 +0000 Received: (at 56504) by debbugs.gnu.org; 13 Jul 2022 15:19:45 +0000 Received: from localhost ([127.0.0.1]:47554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBe9Q-00053T-RP for submit@debbugs.gnu.org; Wed, 13 Jul 2022 11:19:45 -0400 Received: from planete-kraus.eu ([89.234.140.182]:43446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBe9P-00053K-Cn for 56504@debbugs.gnu.org; Wed, 13 Jul 2022 11:19:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 894ddff4; Wed, 13 Jul 2022 15:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:mime-version; s=dkim; bh=tT3rv1qR5j3qikrazz6iENvwg d4=; b=XlmeaFH4wLPuFFWXsrHUzSZ6/9yz2oYkUbeT539qQPjOV11TPiQsbuxua 9f7N6BM0shyNcbWtI2sCyssP8wUQfbdqrlBSR4YE0DpDcOCmEb/0fRbvhbX+eevi 2mxTJFLhUhPwxl8soAAYuIIRLYyid9eFnm7oyel1eWx5MfdMMc= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a76bd9a7 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Wed, 13 Jul 2022 15:19:38 +0000 (UTC) Message-ID: Date: Wed, 13 Jul 2022 17:19:36 +0200 In-Reply-To: References: <9418154f0a4f8c2b06b1b5bbce8df570ec4028de.camel@planete-kraus.eu> <29fa1e573d51f351796ba22d7344d9738d71c9be.camel@planete-kraus.eu> Content-Type: multipart/mixed; boundary="=-xU17Lpedq0CI+TYYISzz" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via 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=1657725609; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=GOfHlZ+0QOAHzmvYSfhBEa+IRNRpeHGfDCIRjcHjh10=; b=lOzjjx3XKsh5xFZ8Wm+WRET90feM1+oRRw+aOufpUYiUbdgYTe5hfDwlCmoOpOJDFcfkzg XutmAfI4FKUayFmilWYN23MuHLeVcXPCykIvpOp8aNivb/DJGwWC1bXsiSbwSG31cgNqGj 3CnvrmABbkEneIWyBlwQpvwMKkOHVghtRTvJt/oyZIKTkpkSylDxCTJPjoqSFNQDN2ROki wJ24QgcqUHaLJg15gCrJ2EO7g2jEsmXuyRk3BMn2Lo2lLxxe7r+P5FMbtgob605fMCsrpH FlWM2FMRu8amElwfFeHcXpFibqlVEDoLnS7lxRPmeHI8G2s1etIZ92nkMzOHLg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657725609; a=rsa-sha256; cv=none; b=hMXNtMg1ZSALfSZTsCidgLM7coO+Q1dXN0wvKImnyrhU92xRcHcm30Jxpmx4J/pjKORHhO IjLeokX1wRUbYhtSo5UldFvO5NogKMCFsNiDCUj/IYcP0QDpGM+t634Zs1zgSGhinKbeNi zuwJdaJK6TAUxVyk7fGWP1XEXuKWfg1jiHO7BfXGDo37Rw7t5cnBpFxNCTIVkl/TQP5GkW 2h6ElcK4J4Z+vNQqdO+82ckWYUBB//O9L+p1U7Mcu20Iw0z4ar8YPudjs0d2PzsCohdr+T EWTy64GFTfkuoZOIR2zZO7ZV9A7lhVr9yyGaSPwkgz7tXmKaz7L0fBXdAoVf5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=XlmeaFH4; dmarc=pass (policy=none) header.from=gnu.org; 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: -2.34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=XlmeaFH4; dmarc=pass (policy=none) header.from=gnu.org; 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: 7820D14FEA X-Spam-Score: -2.34 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ys4S8WmbgJ72 --=-xU17Lpedq0CI+TYYISzz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Le mercredi 13 juillet 2022 à 07:49 +0200, Liliana Marie Prikler a écrit : > 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: > > > > +                     `((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"). Looking at the "-builder" scheme file that is generated for the derivation, it looks like what I want is simply %outputs, not %build- outputs. > > > > > +                     `((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? No, SHARED_MODE=1 means "please also install the DLL" and SHARED_MODE=0 means "please do not install the DLL". Reading the win32/Makefile.gcc, nothing special is done if SHARED_MODE=0. It is only used in the install and uninstall targets. I don’t really understand why you would want to set SHARED_MODE=0 (even weirder to set it as a default) but I guess it happens. --=-xU17Lpedq0CI+TYYISzz Content-Disposition: attachment; filename="v3-0001-gnu-zlib-Support-mingw-cross-compilation.patch" Content-Type: text/x-patch; name="v3-0001-gnu-zlib-Support-mingw-cross-compilation.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA2OTkxNDE2OTA3Y2IyYjNlOGJlNjM5YzE4Y2VjYjZiZjUxOWRhOTA0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaXZpZW4gS3JhdXMgPHZpdmllbkBwbGFuZXRlLWtyYXVzLmV1 PgpEYXRlOiBTYXQsIDI1IEp1biAyMDIyIDE2OjMzOjQ0ICswMjAwClN1YmplY3Q6IFtQQVRDSCB2 M10gZ251OiB6bGliOiBTdXBwb3J0IG1pbmd3IGNyb3NzLWNvbXBpbGF0aW9uLgoKKiBnbnUvcGFj a2FnZXMvY29tcHJlc3Npb24uc2NtICh6bGliKTogT25seSBydW4gY29uZmlndXJlIGlmIG5vdCBt aW5ndy4KLS0tCiBnbnUvcGFja2FnZXMvY29tcHJlc3Npb24uc2NtIHwgMTcgKysrKysrKysrKysr KystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jb21wcmVzc2lvbi5zY20gYi9nbnUvcGFja2FnZXMv Y29tcHJlc3Npb24uc2NtCmluZGV4IGQ1YmQzYWJmMGYuLjg3MWY5MDY1NmMgMTAwNjQ0Ci0tLSBh L2dudS9wYWNrYWdlcy9jb21wcmVzc2lvbi5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NvbXByZXNz aW9uLnNjbQpAQCAtMTEzLDcgKzExMywxNiBAQCAoZGVmaW5lLXB1YmxpYyB6bGliCiAgICAgKGJ1 aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQogICAgIChvdXRwdXRzICcoIm91dCIgInN0YXRp YyIpKQogICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnBoYXNlcworICAgICBgKCM6bWFrZS1mbGFn cworICAgICAgICwoaWYgKHRhcmdldC1taW5ndz8pCisgICAgICAgICAgICBgKGxpc3QgLChzdHJp bmctYXBwZW5kICJQUkVGSVg9IiAoJWN1cnJlbnQtdGFyZ2V0LXN5c3RlbSkgIi0iKQorICAgICAg ICAgICAgICAgICAgICJCSU5BUllfUEFUSCA9ICQocHJlZml4KS9iaW4iCisgICAgICAgICAgICAg ICAgICAgIklOQ0xVREVfUEFUSCA9ICQocHJlZml4KS9pbmNsdWRlIgorICAgICAgICAgICAgICAg ICAgICJMSUJSQVJZX1BBVEggPSAkKHByZWZpeCkvbGliIgorICAgICAgICAgICAgICAgICAgICJT SEFSRURfTU9ERSA9IDEiCisgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgInByZWZp eCA9ICIgKGFzc29jLXJlZiAlb3V0cHV0cyAib3V0IikpKQorICAgICAgICAgICAgJycoKSkKKyAg ICAgICAjOnBoYXNlcwogICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKICAg ICAgICAgIChyZXBsYWNlICdjb25maWd1cmUKICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91 dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQpAQCAtMTI1LDggKzEzNCwxMCBAQCAoZGVmaW5lLXB1 YmxpYyB6bGliCiAgICAgICAgICAgICAgICAsQChpZiAoJWN1cnJlbnQtdGFyZ2V0LXN5c3RlbSkK ICAgICAgICAgICAgICAgICAgICAgIGAoKHNldGVudiAiQ0hPU1QiICwoJWN1cnJlbnQtdGFyZ2V0 LXN5c3RlbSkpKQogICAgICAgICAgICAgICAgICAgICAgJygpKQotICAgICAgICAgICAgICAgKGlu dm9rZSAiLi9jb25maWd1cmUiCi0gICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5k ICItLXByZWZpeD0iIG91dCkpKSkpCisgICAgICAgICAgICAgICAsQChpZiAodGFyZ2V0LW1pbmd3 PykKKyAgICAgICAgICAgICAgICAgICAgIGAoKHJlbmFtZS1maWxlICJ3aW4zMi9NYWtlZmlsZS5n Y2MiICJNYWtlZmlsZSIpKQorICAgICAgICAgICAgICAgICAgICAgYCgoaW52b2tlICIuL2NvbmZp Z3VyZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1w cmVmaXg9IiBvdXQpKSkpKSkpCiAgICAgICAgICAoYWRkLWFmdGVyICdpbnN0YWxsICdtb3ZlLXN0 YXRpYy1saWJyYXJ5CiAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ct b3RoZXIta2V5cykKICAgICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAi b3V0IikpCgpiYXNlLWNvbW1pdDogZGNmMTMzNTg3YWM3ZDczYmEzMDZhMzE0ZTFhNDk2YTdlZmI5 OTYwYgotLSAKMi4zNi4xCgo= --=-xU17Lpedq0CI+TYYISzz--