diff options
author | Andreas Enge <andreas@enge.fr> | 2019-06-20 22:59:12 +0200 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2019-06-21 09:28:07 +0200 |
commit | 88f913e8ad71309ff0c0793b74e4c704489b104f (patch) | |
tree | 3623b765f6cd8072fe99024fd756d5e1b57694ad | |
parent | 2c12be76cde47794291c7d4f295d0a069aeff9df (diff) | |
download | guix-patches-88f913e8ad71309ff0c0793b74e4c704489b104f.tar guix-patches-88f913e8ad71309ff0c0793b74e4c704489b104f.tar.gz |
gnu: lrcalc: Add a patch for identifying include files.
* gnu/packages/patches/lrcalc-includes.patch: New file.
* gnu/packages/algebra.scm (lrcalc): Use patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/algebra.scm | 3 | ||||
-rw-r--r-- | gnu/packages/patches/lrcalc-includes.patch | 92 |
3 files changed, 95 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 649d901bf3..17acef9b15 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1044,6 +1044,7 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-for-extempore.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ + %D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ %D%/packages/patches/lua-pkgconfig.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 561347ad98..7fca1358ff 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1503,7 +1503,8 @@ John Cremona to compute his elliptic curve database.") (file-name (git-file-name name version)) (sha256 (base32 - "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")))) + "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")) + (patches (search-patches "lrcalc-includes.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/patches/lrcalc-includes.patch b/gnu/packages/patches/lrcalc-includes.patch new file mode 100644 index 0000000000..e15286905b --- /dev/null +++ b/gnu/packages/patches/lrcalc-includes.patch @@ -0,0 +1,92 @@ +Patch taken from the Sage packaging system. + +From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001 +From: Anders Skovsted Buch <asbuch@math.rutgers.edu> +Date: Sun, 29 Nov 2015 16:25:56 -0500 +Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to + "vector.h", plus similar cases. + +--- + src/lrcalc.c | 2 +- + src/maple.c | 4 ++-- + src/schublib.h | 2 +- + src/symfcn.c | 6 +++--- + src/symfcn.h | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/lrcalc.c b/src/lrcalc.c +index aff3f75..60df49e 100644 +--- a/src/lrcalc.c ++++ b/src/lrcalc.c +@@ -8,7 +8,7 @@ + #include <stdlib.h> + extern char *optarg; + +-#include <vectarg.h> ++#include "vectarg.h" + + #include "symfcn.h" + #include "maple.h" +diff --git a/src/maple.c b/src/maple.c +index fdc0768..a5f4d14 100644 +--- a/src/maple.c ++++ b/src/maple.c +@@ -4,8 +4,8 @@ + */ + + #include <stdio.h> +-#include <vector.h> +-#include <hashtab.h> ++#include "vector.h" ++#include "hashtab.h" + #include "maple.h" + + +diff --git a/src/schublib.h b/src/schublib.h +index a8e8511..864850c 100644 +--- a/src/schublib.h ++++ b/src/schublib.h +@@ -1,7 +1,7 @@ + #ifndef _SCHUBLIB_H + #define _SCHUBLIB_H + +-#include <hashtab.h> ++#include "hashtab.h" + + hashtab *trans(vector *w, int vars, hashtab *res); + hashtab *monk(int i, hashtab *slc, int rank); +diff --git a/src/symfcn.c b/src/symfcn.c +index 4ffbe4b..fd5df5d 100644 +--- a/src/symfcn.c ++++ b/src/symfcn.c +@@ -5,9 +5,9 @@ + + #include <stdio.h> + +-#include <alloc.h> +-#include <vector.h> +-#include <hashtab.h> ++#include "alloc.h" ++#include "vector.h" ++#include "hashtab.h" + + #include "symfcn.h" + +diff --git a/src/symfcn.h b/src/symfcn.h +index b8543b1..29bb00d 100644 +--- a/src/symfcn.h ++++ b/src/symfcn.h +@@ -1,8 +1,8 @@ + #ifndef _SYMFCN_H + #define _SYMFCN_H + +-#include <hashtab.h> +-#include <vector.h> ++#include "hashtab.h" ++#include "vector.h" + + int part_itr_sz(vector *part); + int part_itr_sub(vector *part, vector *outer); +-- +2.1.1.1.g1fb337f + |