[PR PATCH] armadillo: remove absolute paths form headers

[PR PATCH] armadillo: remove absolute paths form headers

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org armadillo
https://github.com/void-linux/void-packages/pull/23820

armadillo: remove absolute paths form headers
It was #define ARMA_SUPERLU_INCLUDE_DIR /usr/arm-linux-gnueabihf/usr/include/
before. Absolute paths can't match usage of same package in both
cross and native environment at same time, let alone expansion of
'linux' macro. As all headers are installed into standard location,
relative path works.
Not suitable to upstream.

A patch file from https://github.com/void-linux/void-packages/pull/23820.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-armadillo-23820.patch --]
[-- Type: text/x-diff, Size: 2990 bytes --]

From dd7287331284f38f617568861b4a5396a37410b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 24 Jul 2020 23:52:43 +0200
Subject: [PATCH] armadillo: remove absolute paths form headers

It was #define ARMA_SUPERLU_INCLUDE_DIR /usr/arm-linux-gnueabihf/usr/include/
before. Absolute paths can't match usage of same package in both
cross and native environment at same time, let alone expansion of
'linux' macro. As all headers are installed into standard location,
relative path works.
Not suitable to upstream.
---
 .../patches/9.700.2--include_dirs.patch       | 40 +++++++++++++++++++
 srcpkgs/armadillo/template                    |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch

diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
new file mode 100644
index 00000000000..f6dea58c7c5
--- /dev/null
+++ b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
@@ -0,0 +1,40 @@
+From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 24 Jul 2020 23:07:44 +0200
+Subject: [PATCH] Absolute paths can't match both cross and native use
+
+
+diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
+index be42243..a285e35 100644
+--- include/armadillo_bits/config.hpp.cmake
++++ include/armadillo_bits/config.hpp.cmake
+@@ -50,7 +50,7 @@
+ #endif
+ 
+ #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
+-#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
++#define ARMA_SUPERLU_INCLUDE_DIR ./
+ //// If you're using SuperLU and want to explicitly include the SuperLU headers,
+ //// uncomment the above define and specify the appropriate include directory.
+ //// Make sure the directory has a trailing /
+@@ -94,7 +94,7 @@
+ //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
+ 
+ #cmakedefine ARMA_USE_ATLAS
+-#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
++#define ARMA_ATLAS_INCLUDE_DIR ./
+ //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
+ //// uncomment the above define and specify the appropriate include directory.
+ //// Make sure the directory has a trailing /
+@@ -140,7 +140,7 @@
+   #undef  ARMA_USE_HDF5
+   #define ARMA_USE_HDF5
+   
+-  #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
++  #define ARMA_HDF5_INCLUDE_DIR ./
+ #endif
+ 
+ #if !defined(ARMA_MAT_PREALLOC)
+-- 
+2.27.0
+
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index ea4d03c1fda..8fd9087fccf 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'armadillo'
 pkgname=armadillo
 version=9.700.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
 hostmakedepends="pkg-config openblas-devel"

Re: armadillo: remove absolute paths form headers

[sgn]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23820#issuecomment-663829777

Comment:
`s/form/from/` in commit message?

Re: [PR PATCH] [Updated] armadillo: remove absolute paths form headers

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org armadillo
https://github.com/void-linux/void-packages/pull/23820

armadillo: remove absolute paths form headers
It was #define ARMA_SUPERLU_INCLUDE_DIR /usr/arm-linux-gnueabihf/usr/include/
before. Absolute paths can't match usage of same package in both
cross and native environment at same time, let alone expansion of
'linux' macro. As all headers are installed into standard location,
relative path works.
Not suitable to upstream.

A patch file from https://github.com/void-linux/void-packages/pull/23820.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-armadillo-23820.patch --]
[-- Type: text/x-diff, Size: 2990 bytes --]

From 040e55ae32a8c08c9c0e8bc966a2e015ec6f7d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 24 Jul 2020 23:52:43 +0200
Subject: [PATCH] armadillo: remove absolute paths from headers

It was #define ARMA_SUPERLU_INCLUDE_DIR /usr/arm-linux-gnueabihf/usr/include/
before. Absolute paths can't match usage of same package in both
cross and native environment at same time, let alone expansion of
'linux' macro. As all headers are installed into standard location,
relative path works.
Not suitable to upstream.
---
 .../patches/9.700.2--include_dirs.patch       | 40 +++++++++++++++++++
 srcpkgs/armadillo/template                    |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch

diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
new file mode 100644
index 00000000000..f6dea58c7c5
--- /dev/null
+++ b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
@@ -0,0 +1,40 @@
+From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 24 Jul 2020 23:07:44 +0200
+Subject: [PATCH] Absolute paths can't match both cross and native use
+
+
+diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
+index be42243..a285e35 100644
+--- include/armadillo_bits/config.hpp.cmake
++++ include/armadillo_bits/config.hpp.cmake
+@@ -50,7 +50,7 @@
+ #endif
+ 
+ #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
+-#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
++#define ARMA_SUPERLU_INCLUDE_DIR ./
+ //// If you're using SuperLU and want to explicitly include the SuperLU headers,
+ //// uncomment the above define and specify the appropriate include directory.
+ //// Make sure the directory has a trailing /
+@@ -94,7 +94,7 @@
+ //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
+ 
+ #cmakedefine ARMA_USE_ATLAS
+-#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
++#define ARMA_ATLAS_INCLUDE_DIR ./
+ //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
+ //// uncomment the above define and specify the appropriate include directory.
+ //// Make sure the directory has a trailing /
+@@ -140,7 +140,7 @@
+   #undef  ARMA_USE_HDF5
+   #define ARMA_USE_HDF5
+   
+-  #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
++  #define ARMA_HDF5_INCLUDE_DIR ./
+ #endif
+ 
+ #if !defined(ARMA_MAT_PREALLOC)
+-- 
+2.27.0
+
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index ea4d03c1fda..8fd9087fccf 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'armadillo'
 pkgname=armadillo
 version=9.700.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
 hostmakedepends="pkg-config openblas-devel"

Re: [PR PATCH] [Merged]: armadillo: remove absolute paths form headers

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

There's a merged pull request on the void-packages repository

armadillo: remove absolute paths form headers
https://github.com/void-linux/void-packages/pull/23820

Description:
It was #define ARMA_SUPERLU_INCLUDE_DIR /usr/arm-linux-gnueabihf/usr/include/
before. Absolute paths can't match usage of same package in both
cross and native environment at same time, let alone expansion of
'linux' macro. As all headers are installed into standard location,
relative path works.
Not suitable to upstream.