From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IMQdKmXyJF/VCQAA0tVLHw (envelope-from ) for ; Sat, 01 Aug 2020 04:41:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4C+EJWXyJF/VdAAA1q6Kng (envelope-from ) for ; Sat, 01 Aug 2020 04:41:09 +0000 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 0C78F940223 for ; Sat, 1 Aug 2020 04:41:09 +0000 (UTC) Received: from localhost ([::1]:42538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1jKU-0000kQ-98 for larch@yhetil.org; Sat, 01 Aug 2020 00:41:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1jKR-0000kD-1A for guix-patches@gnu.org; Sat, 01 Aug 2020 00:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1jKQ-0007gs-OK for guix-patches@gnu.org; Sat, 01 Aug 2020 00:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1jKQ-0000nL-IF for guix-patches@gnu.org; Sat, 01 Aug 2020 00:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42641] [PATCH] gnu: Add Remake. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Aug 2020 04:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42641@debbugs.gnu.org Cc: Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15962568383015 (code B ref -1); Sat, 01 Aug 2020 04:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Aug 2020 04:40:38 +0000 Received: from localhost ([127.0.0.1]:38888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1jJy-0000mS-0f for submit@debbugs.gnu.org; Sat, 01 Aug 2020 00:40:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:44994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1jJr-0000mG-MO for submit@debbugs.gnu.org; Sat, 01 Aug 2020 00:40:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1jJr-0000dG-Dk for guix-patches@gnu.org; Sat, 01 Aug 2020 00:40:27 -0400 Received: from mout01.posteo.de ([185.67.36.141]:37498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1jJl-0007bK-Qa for guix-patches@gnu.org; Sat, 01 Aug 2020 00:40:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9574A16005C for ; Sat, 1 Aug 2020 06:40:19 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BJWfV1fMKz6tmM; Sat, 1 Aug 2020 06:40:17 +0200 (CEST) From: Eric Bavier Date: Fri, 31 Jul 2020 23:40:02 -0500 Message-Id: <20200801044002.18198-1-bavier@member.fsf.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=185.67.36.141; envelope-from=bavier@member.fsf.org; helo=mout01.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/01 00:40:19 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=fsf.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 4.09 X-TUID: Lw84H2zyOC5W * gnu/packages/debug.scm (remake): New variable. * gnu/packages/patches/remake-impure-dirs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/debug.scm | 25 ++++++++++++++++ gnu/packages/patches/remake-impure-dirs.patch | 30 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 gnu/packages/patches/remake-impure-dirs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 181212c70b..299ccf0b69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1507,6 +1507,7 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ + %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/retroarch-disable-online-updater.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 2a3e6edc31..2f58f8e972 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -536,6 +536,31 @@ the position of the variable and allows you to modify its value.") ;; by GPLv3 or later. (license (list license:lgpl3+ license:gpl3+)))) +(define-public remake + (package (inherit gnu-make) + (name "remake") + (version "4.3-1.5") + (source (origin + (method url-fetch) + (uri (let ((upstream-version + (match (string-split version #\-) + ((ver sub) (string-append ver "%2Bdbg-" sub))))) + (string-append "mirror://sourceforge/bashdb/" + "remake/" upstream-version "/" + "remake-" upstream-version ".tar.gz"))) + (file-name (string-append "remake-" version ".tar.gz")) + (sha256 + (base32 + "0xlx2485y0israv2pfghmv74lxcv9i5y65agy69mif76yc4vfvif")) + (patches (search-patches "remake-impure-dirs.patch")))) + (inputs + `(("readline" ,readline) + ,@(package-inputs gnu-make))) + (home-page "http://bashdb.sourceforge.net/remake/") + (description "Remake is an enhanced version of GNU Make that adds improved +error reporting, better tracing, profiling, and a debugger.") + (license license:gpl3+))) + (define-public rr (package (name "rr") diff --git a/gnu/packages/patches/remake-impure-dirs.patch b/gnu/packages/patches/remake-impure-dirs.patch new file mode 100644 index 0000000000..698ac7476c --- /dev/null +++ b/gnu/packages/patches/remake-impure-dirs.patch @@ -0,0 +1,30 @@ +Purity: don't look for library dependencies (of the form `-lfoo') in +/lib and /usr/lib. Likewise, when searching for included Makefiles, +don't look in /usr/include and friends. + +Borrowed from similar patch for GNU Make and adjusted for Remake. + +--- remake-4.3+dbg-1.5/src/read.c.orig 2020-03-14 17:06:16.000000000 -0500 ++++ remake-4.3+dbg-1.5/src/read.c 2020-07-31 22:34:03.862383862 -0500 +@@ -104,7 +104,7 @@ + # define INCLUDEDIR "." + #endif + INCLUDEDIR, +-#ifndef _AMIGA ++#if 0 + "/usr/gnu/include", + "/usr/local/include", + "/usr/include", +--- remake-4.3+dbg-1.5/src/remake.c.orig 2020-03-14 17:06:16.000000000 -0500 ++++ remake-4.3+dbg-1.5/src/remake.c 2020-07-31 22:34:26.798330508 -0500 +@@ -1665,8 +1665,10 @@ + { + static const char *dirs[] = + { ++#if 0 + "/lib", + "/usr/lib", ++#endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* + * This is completely up to the user at product install time. Just define -- 2.27.0