Merge pull request #19080 from xinan1911/20231025135352_new_pr_wget1213

use `sysroot` template in `wget` easyconfigs to define `PKG_CONFIG_PATH`
easybuilders · Oct 27, 2023 · af1ba41 · af1ba41
2 parents a918f71 + 6061636
commit af1ba41
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
diff --git a/easybuild/easyconfigs/w/wget/wget-1.19.4-GCCcore-6.4.0.eb b/easybuild/easyconfigs/w/wget/wget-1.19.4-GCCcore-6.4.0.eb
@@ -31,7 +31,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 osdependencies = [OS_PKG_OPENSSL_DEV]

diff --git a/easybuild/easyconfigs/w/wget/wget-1.20.1-GCCcore-7.3.0.eb b/easybuild/easyconfigs/w/wget/wget-1.20.1-GCCcore-7.3.0.eb
@@ -31,7 +31,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 osdependencies = [OS_PKG_OPENSSL_DEV]

diff --git a/easybuild/easyconfigs/w/wget/wget-1.20.1-GCCcore-8.3.0.eb b/easybuild/easyconfigs/w/wget/wget-1.20.1-GCCcore-8.3.0.eb
@@ -31,7 +31,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 osdependencies = [OS_PKG_OPENSSL_DEV]

diff --git a/easybuild/easyconfigs/w/wget/wget-1.20.3-GCCcore-10.2.0.eb b/easybuild/easyconfigs/w/wget/wget-1.20.3-GCCcore-10.2.0.eb
@@ -32,7 +32,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 osdependencies = [OS_PKG_OPENSSL_DEV]

diff --git a/easybuild/easyconfigs/w/wget/wget-1.20.3-GCCcore-9.3.0.eb b/easybuild/easyconfigs/w/wget/wget-1.20.3-GCCcore-9.3.0.eb
@@ -31,7 +31,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 osdependencies = [OS_PKG_OPENSSL_DEV]

diff --git a/easybuild/easyconfigs/w/wget/wget-1.21.1-GCCcore-10.3.0.eb b/easybuild/easyconfigs/w/wget/wget-1.21.1-GCCcore-10.3.0.eb
@@ -33,7 +33,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 # Optionally, you can use gnutls (default) instead of OpenSSL.

diff --git a/easybuild/easyconfigs/w/wget/wget-1.21.2-GCCcore-11.2.0.eb b/easybuild/easyconfigs/w/wget/wget-1.21.2-GCCcore-11.2.0.eb
@@ -33,7 +33,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 # Optionally, you can use gnutls (default) instead of OpenSSL.

diff --git a/easybuild/easyconfigs/w/wget/wget-1.21.3-GCCcore-11.3.0.eb b/easybuild/easyconfigs/w/wget/wget-1.21.3-GCCcore-11.3.0.eb
@@ -38,7 +38,10 @@ dependencies = [
 ]
 
 # make sure pkg-config picks up system packages (OpenSSL & co)
-preconfigopts = "export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig && "
+local_pc = "%(sysroot)s/usr/lib64/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/pkgconfig:"
+local_pc += "%(sysroot)s/usr/lib/x86_64-linux-gnu/pkgconfig"
+preconfigopts = "export PKG_CONFIG_PATH=%s && " % local_pc
 configopts = '--with-ssl=openssl '
 
 # Optionally, you can use gnutls (default) instead of OpenSSL.