From f5174e14de74ed1c0fcc2a37c99eecb33747fb8b Mon Sep 17 00:00:00 2001
From: Julius Athenstaedt <jathenst@students.uni-mainz.de>
Date: Tue, 23 Apr 2024 00:13:00 +0200
Subject: [PATCH 1/2] add PKG_CONFIG_PATH to profiles to prevent custom entries

---
 scripts/profiles/0.8.0/install/margo.install    | 2 +-
 scripts/profiles/0.8.0/install/mercury.install  | 2 +-
 scripts/profiles/0.9.0/install/margo.install    | 2 +-
 scripts/profiles/0.9.0/install/mercury.install  | 2 +-
 scripts/profiles/0.9.0/install/rocksdb.install  | 2 +-
 scripts/profiles/0.9.1/install/margo.install    | 2 +-
 scripts/profiles/0.9.1/install/mercury.install  | 2 +-
 scripts/profiles/0.9.1/install/parallax.install | 2 +-
 scripts/profiles/0.9.1/install/rocksdb.install  | 2 +-
 scripts/profiles/0.9.2/install/margo.install    | 2 +-
 scripts/profiles/0.9.2/install/mercury.install  | 2 +-
 scripts/profiles/0.9.2/install/parallax.install | 2 +-
 scripts/profiles/0.9.2/install/rocksdb.install  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/profiles/0.8.0/install/margo.install b/scripts/profiles/0.8.0/install/margo.install
index 53f0377da..92962a5a4 100644
--- a/scripts/profiles/0.8.0/install/margo.install
+++ b/scripts/profiles/0.8.0/install/margo.install
@@ -50,7 +50,7 @@ pkg_install() {
     cd "${CURR}"
     ./prepare.sh
     cd "${CURR}/build"
-    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"
+    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"
     make -j"${CORES}"
     make install
 }
diff --git a/scripts/profiles/0.8.0/install/mercury.install b/scripts/profiles/0.8.0/install/mercury.install
index f7a718466..4e38fb298 100644
--- a/scripts/profiles/0.8.0/install/mercury.install
+++ b/scripts/profiles/0.8.0/install/mercury.install
@@ -63,7 +63,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DBUILD_TESTING:BOOL=ON \
         -DMERCURY_USE_SM_ROUTING:BOOL=ON \
diff --git a/scripts/profiles/0.9.0/install/margo.install b/scripts/profiles/0.9.0/install/margo.install
index 014621c68..8fae8ee9e 100644
--- a/scripts/profiles/0.9.0/install/margo.install
+++ b/scripts/profiles/0.9.0/install/margo.install
@@ -50,7 +50,7 @@ pkg_install() {
     cd "${CURR}"
     ./prepare.sh
     cd "${CURR}/build"
-    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"
+    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"
     make -j"${CORES}" install
 }
 
diff --git a/scripts/profiles/0.9.0/install/mercury.install b/scripts/profiles/0.9.0/install/mercury.install
index e2f79ebc0..a56387826 100644
--- a/scripts/profiles/0.9.0/install/mercury.install
+++ b/scripts/profiles/0.9.0/install/mercury.install
@@ -63,7 +63,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DCMAKE_PREFIX_PATH=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DBUILD_TESTING:BOOL=ON \
diff --git a/scripts/profiles/0.9.0/install/rocksdb.install b/scripts/profiles/0.9.0/install/rocksdb.install
index c64eeec78..ae691e0f4 100644
--- a/scripts/profiles/0.9.0/install/rocksdb.install
+++ b/scripts/profiles/0.9.0/install/rocksdb.install
@@ -55,7 +55,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/rocksdb"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \
diff --git a/scripts/profiles/0.9.1/install/margo.install b/scripts/profiles/0.9.1/install/margo.install
index 014621c68..8fae8ee9e 100644
--- a/scripts/profiles/0.9.1/install/margo.install
+++ b/scripts/profiles/0.9.1/install/margo.install
@@ -50,7 +50,7 @@ pkg_install() {
     cd "${CURR}"
     ./prepare.sh
     cd "${CURR}/build"
-    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"
+    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"
     make -j"${CORES}" install
 }
 
diff --git a/scripts/profiles/0.9.1/install/mercury.install b/scripts/profiles/0.9.1/install/mercury.install
index e2f79ebc0..a56387826 100644
--- a/scripts/profiles/0.9.1/install/mercury.install
+++ b/scripts/profiles/0.9.1/install/mercury.install
@@ -63,7 +63,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DCMAKE_PREFIX_PATH=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DBUILD_TESTING:BOOL=ON \
diff --git a/scripts/profiles/0.9.1/install/parallax.install b/scripts/profiles/0.9.1/install/parallax.install
index 2ad839e8d..fbf03c5b3 100644
--- a/scripts/profiles/0.9.1/install/parallax.install
+++ b/scripts/profiles/0.9.1/install/parallax.install
@@ -46,7 +46,7 @@ pkg_install() {
     # sed -i -e 's/KEY_SIZE (256)/KEY_SIZE (4096)/g' ${CURR}/lib/btree/conf.h
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DBUILD_SHARED_LIBS:BOOL=OFF \
         -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE="Release" \
diff --git a/scripts/profiles/0.9.1/install/rocksdb.install b/scripts/profiles/0.9.1/install/rocksdb.install
index 7c3004fee..9b0ad503c 100644
--- a/scripts/profiles/0.9.1/install/rocksdb.install
+++ b/scripts/profiles/0.9.1/install/rocksdb.install
@@ -55,7 +55,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/rocksdb"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \
diff --git a/scripts/profiles/0.9.2/install/margo.install b/scripts/profiles/0.9.2/install/margo.install
index 014621c68..8fae8ee9e 100644
--- a/scripts/profiles/0.9.2/install/margo.install
+++ b/scripts/profiles/0.9.2/install/margo.install
@@ -50,7 +50,7 @@ pkg_install() {
     cd "${CURR}"
     ./prepare.sh
     cd "${CURR}/build"
-    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"
+    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"
     make -j"${CORES}" install
 }
 
diff --git a/scripts/profiles/0.9.2/install/mercury.install b/scripts/profiles/0.9.2/install/mercury.install
index e2f79ebc0..a56387826 100644
--- a/scripts/profiles/0.9.2/install/mercury.install
+++ b/scripts/profiles/0.9.2/install/mercury.install
@@ -63,7 +63,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DCMAKE_PREFIX_PATH=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DBUILD_TESTING:BOOL=ON \
diff --git a/scripts/profiles/0.9.2/install/parallax.install b/scripts/profiles/0.9.2/install/parallax.install
index 8c0cc9e95..ec530ac85 100644
--- a/scripts/profiles/0.9.2/install/parallax.install
+++ b/scripts/profiles/0.9.2/install/parallax.install
@@ -46,7 +46,7 @@ pkg_install() {
     # sed -i -e 's/KEY_SIZE (256)/KEY_SIZE (4096)/g' ${CURR}/lib/btree/conf.h
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
         -DBUILD_SHARED_LIBS:BOOL=ON \
         -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE="Release" \
diff --git a/scripts/profiles/0.9.2/install/rocksdb.install b/scripts/profiles/0.9.2/install/rocksdb.install
index 7c3004fee..9b0ad503c 100644
--- a/scripts/profiles/0.9.2/install/rocksdb.install
+++ b/scripts/profiles/0.9.2/install/rocksdb.install
@@ -55,7 +55,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/rocksdb"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \
+    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \
-- 
GitLab


From 33f62a277adca30c84df1eaee22a4d51e4dc15c3 Mon Sep 17 00:00:00 2001
From: Julius Athenstaedt <jathenst@students.uni-mainz.de>
Date: Tue, 30 Apr 2024 13:01:47 +0200
Subject: [PATCH 2/2] Add Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8371ec332..e669d9123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### New
 
+- Propagate PKG_CONFIG_PATH to dependency scripts ([!185](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/185)).
 - Added syscall support for listxattr family ([!186](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/186)).
 - Remove optimization, removing one RPC per operation ([!195](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/195)).
 - Added the GekkoFS proxy as an optional gateway between client and daemon. The proxy is started on each compute node
-- 
GitLab