Resolve "Move PlPlot drivers to accepted directory"

4 files changed, 47 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 218cc70074db..969a53572a62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnudatalanguage
 	pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
 	pkgver = 1.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gnudatalanguage.github.io/
 	arch = i686
 	arch = x86_64
@@ -39,7 +39,9 @@ pkgbase = gnudatalanguage
 	optdepends = cuda
 	source = gnudatalanguage-1.0.4.tar.gz::https://github.com/gnudatalanguage/gdl/releases/download/v1.0.4/gdl-v1.0.4.tar.gz
 	source = gdl.profile
+	source = gdl-cmake.patch
 	sha512sums = 3206bdd88b0478493221c0552e62620f1c9acbfec6f1900d73d932caae12401bf825e8893c81f844965f79e332bedb6ea99e6ea6f2b21427022efa60d1326eb0
 	sha512sums = b3a3589d2ce8eb5d49c902aa9bc43df0a0fcc369d17deb060026d34fa821881a212ce6aa02edc7ea6c0476b2faacc7455e467af7b5baf672e2653b71b162190f
+	sha512sums = bcb0f55f7f5a203a3f976e7b258019f425aeb8bb1534a381e4b586ad35d62620d5e7d3f5fe7918e29a0634a6df99a5f86a2caa4f62ce4a1e8ef4c647ea860f65
 
 pkgname = gnudatalanguage
diff --git a/.gitignore b/.gitignore
index 491d2d182ec5..f2303024dc68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /*
 !.gitignore
 !gdl.profile
-!gdl_pr_1337.patch
+!gdl-cmake.patch
 !PKGBUILD
 !.SRCINFO
 !.gitlab-ci.yml
diff --git a/PKGBUILD b/PKGBUILD
index ae8fc6da62b7..3b87150ab33e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gnudatalanguage
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
 arch=("i686" "x86_64")
 url="https://gnudatalanguage.github.io/"
@@ -18,9 +18,18 @@ makedepends=("cmake" "eigen" "python-numpy")
 checkdepends=("openssh")
 optdepends=("cuda")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gnudatalanguage/gdl/releases/download/v${pkgver}/gdl-v${pkgver}.tar.gz"
-        "gdl.profile")
+        "gdl.profile"
+        "gdl-cmake.patch")
 sha512sums=("3206bdd88b0478493221c0552e62620f1c9acbfec6f1900d73d932caae12401bf825e8893c81f844965f79e332bedb6ea99e6ea6f2b21427022efa60d1326eb0"
-            "b3a3589d2ce8eb5d49c902aa9bc43df0a0fcc369d17deb060026d34fa821881a212ce6aa02edc7ea6c0476b2faacc7455e467af7b5baf672e2653b71b162190f")
+            "b3a3589d2ce8eb5d49c902aa9bc43df0a0fcc369d17deb060026d34fa821881a212ce6aa02edc7ea6c0476b2faacc7455e467af7b5baf672e2653b71b162190f"
+            "bcb0f55f7f5a203a3f976e7b258019f425aeb8bb1534a381e4b586ad35d62620d5e7d3f5fe7918e29a0634a6df99a5f86a2caa4f62ce4a1e8ef4c647ea860f65")
+
+
+prepare() {
+    cd "${srcdir}/gdl-v1.0.4"
+
+    patch -p1 -i ../gdl-cmake.patch
+}
 
 build() {
     cd "${srcdir}/gdl-v1.0.4"
@@ -29,10 +38,11 @@ build() {
     fi
     mkdir build
     cd build
-    cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr -DEIGEN3=ON -DFFTW=ON -DGLPK=ON \
-        -DGRAPHICSMAGICK=ON -DGRIB=ON -DHDF5=ON -DHDF=ON -DHDFDIR=/opt/hdf4 \
-        -DLIBPROJ=ON -DMAGICK=OFF -DMPI=ON -DNETCDF=ON -DPYTHON=ON \
-        -DPYTHONVERSION=3 -DPYTHON_MODULE=OFF -DQHULL=ON -DREADLINE=ON \
+
+    cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr -DGDL_LIB_DIR="/lib/${pkgname}" \
+        -DEIGEN3=ON -DFFTW=ON -DGLPK=ON -DGRAPHICSMAGICK=ON -DGRIB=ON -DHDF5=ON \
+        -DHDF=ON -DHDFDIR=/opt/hdf4 -DLIBPROJ=ON -DMAGICK=OFF -DMPI=ON -DNETCDF=ON \
+        -DPYTHON=ON -DPYTHONVERSION=3 -DPYTHON_MODULE=OFF -DQHULL=ON -DREADLINE=ON \
         -DSHAPELIB=ON -DUDUNITS2=ON ..
 
     make
diff --git a/gdl-cmake.patch b/gdl-cmake.patch
new file mode 100644
index 000000000000..0c4aa58c3bf2
--- /dev/null
+++ b/gdl-cmake.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7b8801d..dc9bece9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ set(GDL_LIB_DIR "" CACHE PATH "GDL: library directory relative to CMAKE_INSTALL_
+ if ( GDL_LIB_DIR STREQUAL "" OR NOT GDL_LIB_DIR)
+  set (GDL_DRV_DIR "${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/drivers") # CACHE PATH "GDL: where the drivers will be installed.")
+ else()
+- set (GDL_DRV_DIR "${GDL_LIB_DIR}" ) # CACHE PATH "GDL: where the drivers will be installed.")
++ set (GDL_DRV_DIR "${CMAKE_INSTALL_PREFIX}/${GDL_LIB_DIR}" ) # CACHE PATH "GDL: where the drivers will be installed.")
+ endif()
+ # check for 64-bit OS
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+diff --git a/config.h.cmake b/config.h.cmake
+index 7080df9a..327c01d8 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -3,7 +3,7 @@
+ 
+ #define EXEC_PREFIX "@CMAKE_INSTALL_PREFIX@"
+ #define GDLDATADIR "@CMAKE_INSTALL_PREFIX@@GDL_DATA_DIR@"
+-#define GDLLIBDIR "@GDL_LIB_DIR@"
++#define GDLLIBDIR "@CMAKE_INSTALL_PREFIX@@GDL_LIB_DIR@"
+ #define GDL_DRV_DIR "@GDL_DRV_DIR@"
+ #define VERSION "@VERSION@"
+