From 0e66a0abc00d5bf5ac1496e13f4d2f4ef7fe29dc Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 May 2020 06:36:41 -0400
Subject: [PATCH] Trac #29345: add Dima's SPKG patches for ksh compatibility.

Without these three patches, the *.pc files for givaro, linbox, and
fflas-ffpack cause problems with the ksh shell. Since we are removing
the code in configure.ac that sets the shell to bash as part of the
same ticket, these patches are needed to avoid introducing new problems.
---
 .../patches/fix-ksh-pkgconfig.patch           | 28 +++++++++++++++++++
 .../givaro/patches/fix-ksh-pkgconfig.patch    | 27 ++++++++++++++++++
 .../linbox/patches/fix-ksh-pkgconfig.patch    | 28 +++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch
 create mode 100644 build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch
 create mode 100644 build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch

diff --git a/build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch b/build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch
new file mode 100644
index 00000000000..fdaed2eebee
--- /dev/null
+++ b/build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch
@@ -0,0 +1,28 @@
+From 33a5ec4977f36ce3a24c9ee824d9dd053b8cea04 Mon Sep 17 00:00:00 2001
+From: Dima Pasechnik <dimpase@gmail.com>
+Date: Fri, 8 May 2020 15:55:27 +0100
+Subject: [PATCH 1/1] remove 1st and last file in .pc file
+
+this causes problem if building with ksh, as they remain, causing a broken .pc file.
+---
+ fflas-ffpack.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/fflas-ffpack.pc.in b/fflas-ffpack.pc.in
+index a2618d6..e34a744 100644
+--- a/fflas-ffpack.pc.in
++++ b/fflas-ffpack.pc.in
+@@ -1,4 +1,3 @@
+-/------------------ fflas-ffpack.pc ------------------------
+ prefix=@prefix@
+ exec_prefix=@prefix@
+ libdir=@prefix@/lib
+@@ -11,4 +10,3 @@ Version: @VERSION@
+ Requires: givaro >= 4.0.3
+ Libs: @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@
+ Cflags: -I@includedir@  @BLAS_CFLAGS@  @PARFLAGS@ @PRECOMPILE_FLAGS@ @REQUIRED_FLAGS@
+-\-------------------------------------------------------
+\ No newline at end of file
+-- 
+2.26.2
+
diff --git a/build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch b/build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch
new file mode 100644
index 00000000000..28fd95088c8
--- /dev/null
+++ b/build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch
@@ -0,0 +1,27 @@
+From 91dcba743e15288abe69966a5f71704d9adcc57c Mon Sep 17 00:00:00 2001
+From: Dima Pasechnik <dimpase@gmail.com>
+Date: Fri, 8 May 2020 10:22:57 +0100
+Subject: [PATCH 1/1] remove 1st and last lines in givaro.pc.in
+
+---
+ givaro.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/givaro.pc.in b/givaro.pc.in
+index 285b854..af38bf3 100644
+--- a/givaro.pc.in
++++ b/givaro.pc.in
+@@ -1,4 +1,3 @@
+-/------------------ givaro.pc ------------------------
+ prefix=@prefix@
+ exec_prefix=@prefix@
+ libdir=@prefix@/lib
+@@ -11,4 +10,3 @@ Version: @VERSION@
+ Requires:
+ Libs: -L@libdir@ -lgivaro @LIBS@
+ Cflags: -I@includedir@ @REQUIRED_FLAGS@
+-\-------------------------------------------------------
+\ No newline at end of file
+-- 
+2.26.2
+
diff --git a/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch b/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch
new file mode 100644
index 00000000000..e0cb575b1a1
--- /dev/null
+++ b/build/pkgs/linbox/patches/fix-ksh-pkgconfig.patch
@@ -0,0 +1,28 @@
+From 52c78df67a08de074991a93b57946b7bd5ea7196 Mon Sep 17 00:00:00 2001
+From: Dima Pasechnik <dimpase@gmail.com>
+Date: Fri, 8 May 2020 15:53:25 +0100
+Subject: [PATCH 1/1] remove redundant 1st and last lines
+
+they remain if the script is run under ksh, leading to broken .pc file
+---
+ linbox.pc.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/linbox.pc.in b/linbox.pc.in
+index f54285e..eb6835b 100644
+--- a/linbox.pc.in
++++ b/linbox.pc.in
+@@ -1,4 +1,3 @@
+-/------------------ linbox.pc ------------------------
+ prefix=@prefix@
+ exec_prefix=@prefix@
+ libdir=@libdir@
+@@ -11,4 +10,4 @@ Version: @VERSION@
+ Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0
+ Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
+ Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@  @IML_CFLAGS@ @FLINT_CFLAGS@ 
+-\-------------------------------------------------------
++
+-- 
+2.26.2
+