[Git][debian-gis-team/doris][master] 2 commits: Fix lapack library search path
Antonio Valentino
gitlab at salsa.debian.org
Sun Mar 21 10:18:43 GMT 2021
Antonio Valentino pushed to branch master at Debian GIS Project / doris
Commits:
bcaa2d15 by Antonio Valentino at 2021-03-21T10:53:40+01:00
Fix lapack library search path
- - - - -
6d03341e by Antonio Valentino at 2021-03-21T11:15:22+01:00
Improve 0003-tools-build.patch
- - - - -
4 changed files:
- debian/changelog
- debian/patches/0002-configure.patch
- debian/patches/0003-tools-build.patch
- debian/patches/0005-fix-build.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -6,6 +6,9 @@ doris (5.0.3~beta+dfsg-15) UNRELEASED; urgency=medium
[ Antonio Valentino ]
* Depend on non-dummpy h5py packages.
+ * debian/patches:
+ - update 0002-configure.patch for lapack library search path
+ - improve 0003-tools-build.patch
-- Antonio Valentino <antonio.valentino at tiscali.it> Tue, 08 Dec 2020 09:12:57 +0000
=====================================
debian/patches/0002-configure.patch
=====================================
@@ -9,7 +9,7 @@ Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/doris_core/configure b/doris_core/configure
-index 0835c10..8069c5b 100755
+index 0835c10..ebac745 100755
--- a/doris_core/configure
+++ b/doris_core/configure
@@ -50,7 +50,7 @@ set key = $<
@@ -26,7 +26,7 @@ index 0835c10..8069c5b 100755
set VECLIBDIR = ""
set LAPACKDIR = ""
-set LIBDIRS = "../fftw-3.2.1/lib ../../fftw-3.2.1/lib /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib"
-+set LIBDIRS = "../fftw-3.2.1/lib ../../fftw-3.2.1/lib /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib /usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`"
++set LIBDIRS = "../fftw-3.2.1/lib ../../fftw-3.2.1/lib /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /usr/local/lib /usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH` /usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/lapack"
### for fftw include dirs, assume they installed it with doris distributed.
### by doing what we said in install.
set INCLDIRS = "../fftw-3.2.1/include ../../fftw-3.2.1/include /include /usr/include /usr/local/include"
=====================================
debian/patches/0003-tools-build.patch
=====================================
@@ -10,7 +10,9 @@ Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
envisat_tools/envisat_dump_data.c | 2 +-
envisat_tools/envisat_dump_header.c | 2 +-
sar_tools/Makefile | 38 +++++++++++++++++--------------------
- 6 files changed, 40 insertions(+), 44 deletions(-)
+ sar_tools/cpxfiddle.cc | 2 +-
+ sar_tools/rasterheader.cc | 2 +-
+ 8 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/envisat_tools/Makefile b/envisat_tools/Makefile
index 9126dff..3aca074 100755
@@ -236,3 +238,29 @@ index fb3e1de..1123551 100644
### EOF.
+diff --git a/sar_tools/cpxfiddle.cc b/sar_tools/cpxfiddle.cc
+index 97c7702..2e5c84e 100644
+--- a/sar_tools/cpxfiddle.cc
++++ b/sar_tools/cpxfiddle.cc
+@@ -1665,7 +1665,7 @@ static struct option const long_options[] =
+ {
+ int i=0;
+ char subP[8];
+- while (optarg[i] != '/' && optarg[i] != '\0')
++ while (optarg[i] != '/' && optarg[i] != '\0' && i < 7)
+ {
+ subP[i] = optarg[i];
+ ++i;
+diff --git a/sar_tools/rasterheader.cc b/sar_tools/rasterheader.cc
+index a566de0..d1714fe 100644
+--- a/sar_tools/rasterheader.cc
++++ b/sar_tools/rasterheader.cc
+@@ -130,7 +130,7 @@ int main (int argc,char *argv[])
+ ofp=fopen("sunrasterheader","w");
+ fwrite(header, sizeof(int), 8, ofp);
+ fclose(ofp);
+- free(header);
++ // free(header); // header is a stack variable
+ return 0;
+ }
+
=====================================
debian/patches/0005-fix-build.patch
=====================================
@@ -22,7 +22,7 @@ index 0644f8e..7e0368e 100755
else
{
diff --git a/sar_tools/cpxfiddle.cc b/sar_tools/cpxfiddle.cc
-index 97c7702..5873ac2 100644
+index 2e5c84e..6a3cd92 100644
--- a/sar_tools/cpxfiddle.cc
+++ b/sar_tools/cpxfiddle.cc
@@ -1854,7 +1854,7 @@ static struct option const long_options[] =
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/2f23e8a7b0124f51525f6c1622d2aba4001be503...6d03341e68a20af8561443ff516b2a34df2cd200
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/2f23e8a7b0124f51525f6c1622d2aba4001be503...6d03341e68a20af8561443ff516b2a34df2cd200
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210321/3b579a8c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list