Merge branch '267-toolchain-for-ippl-opal-with-gcc-12-3-0' into 'master'

Resolve "toolchain for IPPL/OPAL with gcc/12.3.0" Closes #267 See merge request Pmodules/buildblocks!431
2024-03-19 17:42:39 +01:00
parent 20289cb287 4120533cad
commit e44af53b40
10 changed files with 219 additions and 14 deletions
--- a/Programming/Python/build-xml
+++ b/Programming/Python/build-xml
@@ -0,0 +1,88 @@
+#!/usr/bin/env modbuild
+
+pbuild::pre_configure() {
+	local -a cflags=()
+	local -a ldflags=()
+
+	cflags+=("-fPIC")
+	cflags+=("-I${XZ_INCLUDE_DIR}")
+
+	ldflags+=("-L${XZ_LIBRARY_DIR}")
+
+	if (( V_MAJOR == 2 || (V_MAJOR == 3 && V_MINOR <= 6) )); then
+		cflags+=("-I${OPENSSL_INCLUDE_DIR}" "-I${OPENSSL_INCLUDE_DIR}/openssl")
+		ldflags+=("-L${OPENSSL_LIBRARY_DIR}")
+	else
+		pbuild::add_configure_args "--with-openssl=${OPENSSL_DIR}"
+		#pbuild::add_configure_args "--enable-optimizations"
+	fi
+	pbuild::add_configure_args "CFLAGS=${cflags[*]}"
+	pbuild::add_configure_args "LDFLAGS=${ldflags[*]}"
+	pbuild::add_configure_args "--enable-shared"
+}
+
+pbuild::pre_configure_Linux() {
+	pbuild::add_configure_args "--with-tcltk-includes=-I${TCLTK_INCLUDE_DIR}" 
+	pbuild::add_configure_args "--with-tcltk-libs=-L${TCLTK_LIBRARY_DIR} -ltcl8.6 -ltk8.6"
+}
+
+pbuild::post_install_Linux() {
+	if version_le 3.9.10; then
+		install "${OPENSSL_LIBRARY_DIR}"/libcrypto.so.* "${PREFIX}/lib"
+		install "${OPENSSL_LIBRARY_DIR}"/libssl.so.*	"${PREFIX}/lib"
+		install "${TCLTK_LIBRARY_DIR}"/libtcl*.so	"${PREFIX}/lib"
+		install "${TCLTK_LIBRARY_DIR}"/libtk*.so	"${PREFIX}/lib"
+		install "${XZ_LIBRARY_DIR}"/liblzma.so.*	"${PREFIX}/lib"
+		install /usr/lib64/libffi.so.*			"${PREFIX}/lib"
+	else
+		:
+	fi
+}
+
+pbuild::post_install() {
+	export PATH="${PREFIX}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}"
+	export CFLAGS="-I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl"
+	export CPPFLAGS="-I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl"
+	export LDFLAGS="-L${OPENSSL_LIBRARY_DIR}"
+	ln -fs "${PREFIX}/bin/python${V%%.*}" "${PREFIX}/bin/python"
+	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python"
+	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python${V%.*}"
+
+	if (( V_MAJOR == 2 || (V_MAJOR == 3 && V_MINOR <= 7) )); then
+		cd "${BUILDBLOCK_DIR}"
+		"${PREFIX}/bin/python" 'get-pip.py'
+	fi
+
+	std::info "Building numpy\n"
+	pip${V_MAJOR} install numpy
+
+	std::info "Building scipy\n"
+	pip${V_MAJOR} install scipy
+
+	std::info "Building matplotlib\n"
+	pip${V_MAJOR} install matplotlib
+
+	std::info "Building ipython\n"
+	pip${V_MAJOR} install ipython
+
+	std::info "Building sympy\n"
+	pip${V_MAJOR} install sympy
+
+	std::info "Building nose\n"
+	pip${V_MAJOR} install nose
+
+	std::info "Building h5py\n"
+	pip${V_MAJOR} install h5py
+
+	std::info "Building pandas\n"
+	pip${V_MAJOR} install pandas
+
+	#std::info "Building virtualenv\n"
+	#pip${V_MAJOR} install virtualenv
+
+	#std::info "Building ansible\n"
+	#pip${V_MAJOR} install ansible ansible-core==2.15.4
+}
+
+
--- a/Programming/Python/files/config.yaml
+++ b/Programming/Python/files/config.yaml
@@ -0,0 +1,58 @@
+format: 1
+Python:
+  defaults:
+    group: Programming
+    overlay: base
+    relstage: stable
+    urls:
+      - url: https://www.python.org/ftp/python/${V_PKG}/$P-${V_PKG}.tgz
+
+  shasums:
+    Python-2.7.12.tgz: 3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6
+    Python-2.7.14.tgz: 304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8
+    Python-2.7.16.tgz: 01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5
+    Python-2.7.17.tgz: f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde
+    Python-2.7.18.tgz: da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814
+    Python-3.6.11.tgz: 96621902f89746fffc22f39749c07da7c2917b232e72352e6837d41850f7b90c
+    Python-3.6.3.tgz: ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91
+    Python-3.7.3.tgz: d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff
+    Python-3.7.4.tgz: d63e63e14e6d29e17490abbe6f7d17afb3db182dbd801229f14e55f4157c4ba3
+    Python-3.7.8.tgz: 0e25835614dc221e3ecea5831b38fa90788b5389b99b675a751414c858789ab0
+    Python-3.8.12.tgz: 316aa33f3b7707d041e73f246efedb297a70898c4b91f127f66dc8d80c596f1a
+    Python-3.8.4.tgz: 32c4d9817ef11793da4d0d95b3191c4db81d2e45544614e8449255ca9ae3cc18
+    Python-3.8.8.tgz: 76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7
+    Python-3.9.10.tgz: 1aa9c0702edbae8f6a2c95f70a49da8420aaa76b7889d3419c186bfc8c0e571e
+    Python-3.9.17.tgz: 8ead58f669f7e19d777c3556b62fae29a81d7f06a7122ff9bc57f7dd82d7e014
+    Python-3.9.18.tgz: 504ce8cfd59addc04c22f590377c6be454ae7406cb1ebf6f5a350149225a9354
+  versions:
+    3.9.18-1:
+      config:
+        relstage: unstable
+        build_requires: [openssl/1.1.1w, TclTk/8.6.9, xz/5.2.4]
+    3.9.18:
+      config:
+        relstage: unstable
+        build_requires: [openssl/1.1.1w, TclTk/8.6.9, xz/5.2.4]
+    3.9.17:
+      config:
+        relstage: unstable
+        build_requires: [openssl/1.1.1v, TclTk/8.6.9, xz/5.2.4]
+    3.9.10:
+    3.8.12:
+    3.8.8;3.8.4:
+      config:
+        relstage: deprecated
+    3.7.8:
+      config:
+        relstage: stable
+    3.7.4;3.7.3:
+      config:
+        relstage: deprecated
+    3.6.3:
+    3.4.3;3.4.0:
+      config:
+        relstage: deprecated
+    2.7.17;2.7.16:
+    2.7.14;2.7.12;2.7.11:
+      config:
+        relstage: deprecated
--- a/Programming/cmake/build-yaml
+++ b/Programming/cmake/build-yaml
@@ -1,8 +1,5 @@
 #!/usr/bin/env modbuild

-pbuild::set_download_url "https://cmake.org/files/v${V_MAJOR}.${V_MINOR}/$P-$V.tar.gz"
-pbuild::add_to_group 'Programming'
-
 declare bootstrap_flags=''

 pbuild::pre_configure() {
--- a/Programming/cmake/files/config.yaml
+++ b/Programming/cmake/files/config.yaml
@@ -1,6 +1,7 @@
 format: 1
 cmake:
  defaults:
+    group: Programming
    overlay: base
    relstage: stable
    urls:
@@ -24,19 +25,23 @@ cmake:
    cmake-3.23.2.tar.gz:   f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa
    cmake-3.25.2.tar.gz:   c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c
    cmake-3.26.3.tar.gz:   bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659
+    cmake-3.27.8.tar.gz:   fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc

  versions:
-    2.8.12.2;3.1.3;3.3.2;3.4.1;3.6.3;3.9.6:
-    3.8.1:
-      config:
-        relstage: removed
-    3.10.3;3.13.3;3.14.0:
-      config:
-        build_requires: [gcc/7.3.0]
-    3.15.5;3.19.2;3.20.5;3.23.2;3.25.2:
+    3.27.8:
      config:
        build_requires: [gcc/7.3.0, patchelf/0.8.1]
+        relstage: unstable
    3.26.3:
      config:
        build_requires: [gcc/7.3.0, patchelf/0.8.1]
-        relstage: unstable
+    3.15.5;3.19.2;3.20.5;3.23.2;3.25.2:
+      config:
+        build_requires: [gcc/7.3.0, patchelf/0.8.1]
+    3.10.3;3.13.3;3.14.0:
+      config:
+        build_requires: [gcc/7.3.0]
+    3.8.1:
+      config:
+        relstage: removed
+    2.8.12.2;3.1.3;3.3.2;3.4.1;3.6.3;3.9.6:
--- a/System/bash/build-xml
+++ b/System/bash/build-xml
@@ -0,0 +1,2 @@
+#!/usr/bin/env modbuild
+
--- a/System/bash/files/config.yaml
+++ b/System/bash/files/config.yaml
@@ -0,0 +1,19 @@
+format: 1
+bash:
+  defaults:
+    relstage: stable
+    group: System
+    overlay: base
+    urls:
+      - url: https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz
+
+  shasums:
+    bash-4.3.30.tar.gz: 317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd
+    bash-5.1.tar.gz: cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
+    bash-5.1.16.tar.gz: 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558
+    bash-5.2.21.tar.gz: c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
+  versions:
+    4.3.30;5.1;5.1.16:
+    5.2.21:
+      config:
+        relstage: unstable
--- a/System/patchelf/build-xml
+++ b/System/patchelf/build-xml
@@ -0,0 +1,6 @@
+#!/usr/bin/env modbuild
+
+pbuild::post_prep() {
+	cd "${SRC_DIR}"
+	./bootstrap.sh
+}
--- a/System/patchelf/files/config.yaml
+++ b/System/patchelf/files/config.yaml
@@ -0,0 +1,22 @@
+format: 1
+patchelf:
+  defaults:
+    group: System
+    overlay: base
+    relstage: stable
+    urls:
+      - url: https://github.com/NixOS/$P/archive/$V.tar.gz
+        name: $P-$V.tar.gz
+  shasums:
+    patchelf-0.8.1.tar.bz2: 12367e9ce9c315a26e14f11db8542e2e0f3a877aff52590912111268cb775bef7ce713368eb3759df6823f457a7b6d0419fd02c231d40db5dd0b853f41caf254
+    patchelf-0.11.tar.gz: b156bad513d5bac33aaf61d5f04d5a78efc81abf8c0ccb851f605e1137c21e671b4933263a47543daf5064db5e83c9afa836b1aea143fca7d8e6a18ebf96beb8
+    patchelf-0.12.tar.gz: 2563a5b22b90392d5755d9a08022daf8570fa1b741becbbca92548d0a2f82f7ee21175a2c34816a4653c89c2219bf59b1440304b0fa2d49842e398ab18b9923c
+    patchelf-0.14.5.tar.gz: 1b7eca84f6fe2d6f6d4469ca1ccdf35dc920d2052ba94b7daeba6c8cb41fdaff20b1e5bac7c8a7650ff12bf4156da87f84d32e75b09958636dc992a1b7b1a59d
+
+  versions:
+    0.8.1;0.11;0.12;0.14.5:
+    0.18.0:
+      config:
+        relstage: unstable
+        build_requires: [gcc/12.3.0]
+
--- a/Tools/git/files/config.yaml
+++ b/Tools/git/files/config.yaml
@@ -21,6 +21,14 @@ git:
    git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
    git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
  versions:
+    2.43.1:
+      config:
+        runtime_deps: [TclTk/8.6.9]
+        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8, openssl/1.1.1w]
+        relstage: unstable
+        overlay: devel
+        systems: [rhel7, rhel8, rhel9]
+        docfiles: [COPYING, README.md]
    2.42.0:
      config:
        runtime_deps: [TclTk/8.6.9]
--- a/Tools/openssl/files/variants.rhel7
+++ b/Tools/openssl/files/variants.rhel7
@@ -7,5 +7,5 @@ openssl/1.1.1g stable
 openssl/1.1.1k stable
 openssl/1.1.1l stable
 openssl/1.1.1m stable
-openssl/1.1.1v unstable
-openssl/1.1.1w unstable
+openssl/1.1.1v stable
+openssl/1.1.1w stable