From patchwork Thu Jan 26 00:24:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46412 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 D551A27BBED; Thu, 26 Jan 2023 00:25:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 90CAD27BBEB for ; Thu, 26 Jan 2023 00:25:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKq4f-0003KY-Nc; Wed, 25 Jan 2023 19:25:05 -0500 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 1pKq4c-0003Id-QG for guix-patches@gnu.org; Wed, 25 Jan 2023 19:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKq4c-0000mC-Hd for guix-patches@gnu.org; Wed, 25 Jan 2023 19:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKq4c-0002OG-Cq for guix-patches@gnu.org; Wed, 25 Jan 2023 19:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH 2/3] gnu: wine: Build more reproducibly. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Jan 2023 00:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61067@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.16746926579113 (code B ref 61067); Thu, 26 Jan 2023 00:25:02 +0000 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 00:24:17 +0000 Received: from localhost ([127.0.0.1]:60231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3s-0002Mv-K8 for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:16 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:12253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3o-0002MZ-0U for 61067@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:14 -0500 Date: Thu, 26 Jan 2023 00:24:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674692645; x=1674951845; bh=xx+B0SHTA7oPCULrlXcPsgfyQkXp6ky7Stqf/oHm7R0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=dRnPKFWUSJOGQu9Ji9lojJ7cZ/ynaRuR4nDU4rGd+j1UU7vtCPFvu/zodIGpg6rEF 7No9QJhWoYOkAVK3diixCTlwt6b4EQzlai5HMbrF47ojmrcAugUB9eyAQRFEyW1ddK ONxHSGIoOpomivp0owF0Y8HOTNjbteb1GbR4R7nNaK62fUVeO6LJmZd4Th4AvtJPWu 9GezcBzaGFTa21moa+w3aqF/hbXVrMJLUIZTV8jrLNif3vaxuvWPIZwXi/7ntMZO3F 9s62skLU/vErhW90ZSbtiOKqMV0Ku5I8Blqu0OpFvqMLGSUeiXq8LyNL38NEwvGm42 jk4uHsQqqik7Q== Message-ID: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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/wine.scm (wine)[phases]: Add a new 'set-widl-time-override phase. --- gnu/packages/wine.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..0de34e320d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -195,7 +195,12 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -289,7 +294,12 @@ (define-public wine64 (search-path library-path soname)))) (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases @@ -326,7 +336,12 @@ (define-public wine-minimal (search-path library-path soname)))) (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags (list "--without-freetype" "--without-x")