From patchwork Tue Jun 18 11:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 65456 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 805BA27BBE9; Tue, 18 Jun 2024 12:28:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ABC6127BBE2 for ; Tue, 18 Jun 2024 12:28:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJX0M-0004co-63; Tue, 18 Jun 2024 07:28:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJX0K-0004Z2-Iv for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJX0K-00081t-9I for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJX0M-0005cV-ND for guix-patches@gnu.org; Tue, 18 Jun 2024 07:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71630] [PATCH 3/5] gnu: make-mingw-w64: Update to 12.0.0. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jun 2024 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71630@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71630-submit@debbugs.gnu.org id=B71630.171871005721546 (code B ref 71630); Tue, 18 Jun 2024 11:28:02 +0000 Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:37 +0000 Received: from localhost ([127.0.0.1]:42088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzw-0005bL-H7 for submit@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:37 -0400 Received: from mail-lf1-f49.google.com ([209.85.167.49]:57356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJWzt-0005ab-2u for 71630@debbugs.gnu.org; Tue, 18 Jun 2024 07:27:34 -0400 Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-52bc035a7ccso5598660e87.2 for <71630@debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1718709984; x=1719314784; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oPjr3clDVHxsE9TfnVL7+h4zkHfJWpqFVPFr4/xbJZM=; b=UwL7uqSv4ZfW+dgVXTLopioCkEh7zDrSCysEiR+lq0T4d9av9VhI8VxtnhRWUx6pTZ fFOgZoiMuguZtmX1fgsCU8El2xd4C8ZFLFnOyNssvSxIOt+y0MUBBD6oMjSBYCHhnkEi grmybAD6pigigMhTD9RIgVFLzd1hmueWWNLsU8GkwIkhM4oBNI3P2WDBtrNQbRsH6VYI CuWdE76xzGXffMTDHOMJ26Ng0CCfdXdZR6tg9H+9xwfGPxMZKpQqmp8ndFemTYfRRQ6b RO79vRE9PN/iTDI9o9uPGqoAkKD0o6Tkl4gKYwRWpZeZexrFhXJs5fn18Gp/BQSXXLV6 y+yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718709984; x=1719314784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oPjr3clDVHxsE9TfnVL7+h4zkHfJWpqFVPFr4/xbJZM=; b=n4Ho4Btj3Kk6qL+Tm8RRPMh5ugmIQiHAIgMXGyyPACxo0MV6DMWavrDTG9G7tsQJ0C tj4XcSKlZh1KCpxKhmxxi7cx1+K/xAuxtyyyB/Iz+m1tAP39qLYXo1IUCkUk+xKGkax4 wZFbzYbelh4epsUy0uSj+m2fw5daLKB1g9BIYziUS/YlbWAo+tce0ZU/MpAjw6ofZn9e GYgBdQHiGEGymjeBPzgLjvSliYj7IFhiwy3FcdzLU5JFpyojfkX/e90EpU0bQVb64mdA 3/aGHJYTE8Dh+sQXZkdN5rKv+0fjIselffpXEdADPZGa6va7IOqU/3+faUxECPlFTVb+ hd9g== X-Gm-Message-State: AOJu0YycNIWJUDTTRgfi6IBxVGq7RMKQzUIRtPWaCnxe4WAnuyjGgUIy LjVQGoXngqr4DlFc2m8sDJgIGeC/f5rDjJdMEan4Dz1uSmEukYJVYNwVK9Eyt3HGKhe+UIae4Z/ X X-Google-Smtp-Source: AGHT+IHPJtlwa0qaOgVsXRQFCXNkAtHGxT7NkOOO3upAFeJ5wZWtVT7OHjdfUov/OObvAcZaKZqXXQ== X-Received: by 2002:a05:6512:517:b0:52b:796e:66a5 with SMTP id 2adb3069b0e04-52ca6e9954cmr6598930e87.66.1718709984302; Tue, 18 Jun 2024 04:26:24 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 04:26:24 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 18 Jun 2024 13:26:15 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mingw.scm (make-mingw-w64): Update to 12.0.0. * gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: Delete patch. * gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: Delete patch. * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Delete patch. * gnu/local.mk: Unregister patches. Change-Id: Id9d7d17926280b21016a7217da44004e06e436cd --- gnu/local.mk | 2 - gnu/packages/mingw.scm | 17 +++-- .../patches/mingw-w64-6.0.0-gcc.patch | 65 ------------------- .../mingw-w64-dlltool-temp-prefix.patch | 26 -------- .../mingw-w64-reproducible-gendef.patch | 33 ---------- 5 files changed, 10 insertions(+), 133 deletions(-) delete mode 100644 gnu/packages/patches/mingw-w64-6.0.0-gcc.patch delete mode 100644 gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch delete mode 100644 gnu/packages/patches/mingw-w64-reproducible-gendef.patch diff --git a/gnu/local.mk b/gnu/local.mk index c5c9ff48bb..0deb1ee071 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1731,8 +1731,6 @@ dist_patch_DATA = \ %D%/packages/patches/mia-vtk92.patch \ %D%/packages/patches/mia-vtk-version.patch \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ - %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \ - %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ %D%/packages/patches/miniz-for-pytorch.patch \ diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 825a784e0d..e2fb84ce63 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -43,7 +43,7 @@ (define* (make-mingw-w64/implementation machine (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -51,11 +51,7 @@ (define* (make-mingw-w64/implementation machine "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")) - (patches - (search-patches "mingw-w64-6.0.0-gcc.patch" - "mingw-w64-dlltool-temp-prefix.patch" - "mingw-w64-reproducible-gendef.patch")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) @@ -84,7 +80,14 @@ (define* (make-mingw-w64/implementation machine #~(list #$(string-append "--host=" triplet) #$@(if with-winpthreads? #~("--with-libraries=winpthreads") - #~())) + #~()) + ;; The default msvcrt changed on 12.0.0 to use UCRT as the + ;; default, this could cause problems with programs expecting + ;; MSVCRT as the default. + ;; + ;; XXX: A new target to use UCRT can be introduced as + ;; the MSYS2 project does, e.g: x86_64-w64-ucrt-mingw32. + "--with-default-msvcrt=msvcrt") #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch deleted file mode 100644 index 036cf79f91..0000000000 --- a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch +++ /dev/null @@ -1,65 +0,0 @@ -This patch includes - - * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 - * mingw-w64-headers/crt/math.h: Likewise - * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add - symbols. - * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): - Add symbols. - (lstat): Add function. - * mingw-w64-headers/crt/_mingw_stat64.h: Likewise - * mingw-w64-headers/crt/stdlib.h (realpath): Add function. - -Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. - -Upstream status: not yet presented upstream. - -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 5874f4e..bdf4ead 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -22,6 +22,15 @@ - #if (__GNUC__ < 4) - #error Corrupt install of gcc-s internal headers, or search order was changed. - #else -+ -+ /* From gcc-4.9.3 float.h. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* #include_next */ - - /* Number of decimal digits, q, such that any floating-point number with q -diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h -index 1e970f4..99a332f 100644 ---- a/mingw-w64-headers/crt/math.h -+++ b/mingw-w64-headers/crt/math.h -@@ -216,6 +216,7 @@ extern "C" { - #endif - } - -+#if 0 - __CRT_INLINE long double __cdecl fabsl (long double x) - { - #ifdef __arm__ -@@ -226,6 +227,7 @@ extern "C" { - return res; - #endif - } -+#endif - - __CRT_INLINE double __cdecl fabs (double x) - { -@@ -905,7 +907,7 @@ __mingw_choose_expr ( \ - /* 7.12.7.3 */ - extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ - extern float __cdecl hypotf (float x, float y); --#ifndef __CRT__NO_INLINE -+#if 0 //ndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} - #endif - extern long double __cdecl hypotl (long double, long double); diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch deleted file mode 100644 index 432cafc162..0000000000 --- a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 4974e2c:debian/patches/dlltool-temp-prefix.patch - -Description: Specify dlltool's temp prefix -Author: Stephen Kitt - -By default dlltool uses its pid for the object files it generates. -Enforcing its temp prefix allows the files it generates to be -reproducible. - ---- a/mingw-w64-crt/Makefile.am -+++ b/mingw-w64-crt/Makefile.am -@@ -36,7 +36,7 @@ - DTDEF32=$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS) - DTDEF64=$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS) - else -- AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ -+ AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ --temp-prefix $$(basename $@ .a) - DLLTOOLFLAGSARM32=-m arm - DLLTOOLFLAGSARM64=-m arm64 - DLLTOOLFLAGS32=--as-flags=--32 -m i386 diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch deleted file mode 100644 index 8dbea54ce9..0000000000 --- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch +++ /dev/null @@ -1,33 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 9a33f50:debian/patches/reproducible-build.patch - -Description: Drop __DATE__ from gendef and genlib -Author: Stephen Kitt - -This allows gendef and genlib to be built reproducibly. - ---- a/mingw-w64-tools/gendef/src/gendef.c -+++ b/mingw-w64-tools/gendef/src/gendef.c -@@ -196,7 +196,6 @@ - " By default, the output files are named after their DLL counterparts\n" - " gendef MYDLL.DLL Produces MYDLL.def\n" - " gendef - MYDLL.DLL Prints the exports to stdout\n"); -- fprintf (stderr, "\nBuilt on %s\n", __DATE__); - fprintf (stderr, "\nReport bugs to \n"); - exit (0); - } ---- a/mingw-w64-tools/genlib/src/genlib.c -+++ b/mingw-w64-tools/genlib/src/genlib.c -@@ -123,7 +123,6 @@ - "Usage example:\n" - " By default, the output file is named after the DLL counterpart\n" - " genlib mydef.def Produces libmydll.a\n" --"\nBuilt on " __DATE__ "\n" - "\nReport bugs to \n" - ; -