Update to latest.

This commit is contained in:
andreili 2023-11-30 19:58:01 +01:00
parent 175b33c861
commit c2d0aeabb0
9 changed files with 34 additions and 18 deletions

View File

@ -1,4 +1,5 @@
AUX cxx13_fix.patch 357 BLAKE2B c76777905f495ebc604f83fff97954223ab80de6176d068d16e7bbe8ba3fb5ac1bc932e44fd54e633b09076a16059d56952edeaeff747243f4e87459c07b9cc6 SHA512 a4fcfca3ad6b9ec4cba813f1ca11fc061ab42ad46051a4f33e3212648a3db0971a2a08f7b31fa1f96d0f88cfab01b3b2abee22b0ffe04c1624fa0f823dd240f8
AUX openroad_build.patch 21914 BLAKE2B 8788cb36b6bb10b0980a8635ff376cf04aceeff00946bf00d5d1fbe4589c9e27c171eeb8d6940e56b658b2e91baca0cadaa073e57d9a288a4dc4618bb6b8237a SHA512 574602d115497b216d7866d281249a1c7f7e738b0b87f2e13f4add463cf93a424edc022f6e634a56bc897fec03e25315afde10633b772b982daa6bec4b7d2344 AUX openroad_build.patch 21914 BLAKE2B 8788cb36b6bb10b0980a8635ff376cf04aceeff00946bf00d5d1fbe4589c9e27c171eeb8d6940e56b658b2e91baca0cadaa073e57d9a288a4dc4618bb6b8237a SHA512 574602d115497b216d7866d281249a1c7f7e738b0b87f2e13f4add463cf93a424edc022f6e634a56bc897fec03e25315afde10633b772b982daa6bec4b7d2344
AUX openroad_build1.patch 8442 BLAKE2B 4dd9e5d99b55937289a59b0510697f6a600b0eb3917cfe02bc8b271fa818198081940999152a9d782753ea78cec8c42ed4ea92d7541a04b7533c5acb3294e0d3 SHA512 0ff3e8b01c40386e916053592f41d1a8e746a00aeae763accce5af92efd835e1fd6815efa70ff7b3a23692b5ad1965e8839aa23e72be0d28f26859dfd47d0ac4 AUX openroad_build1.patch 8442 BLAKE2B 4dd9e5d99b55937289a59b0510697f6a600b0eb3917cfe02bc8b271fa818198081940999152a9d782753ea78cec8c42ed4ea92d7541a04b7533c5acb3294e0d3 SHA512 0ff3e8b01c40386e916053592f41d1a8e746a00aeae763accce5af92efd835e1fd6815efa70ff7b3a23692b5ad1965e8839aa23e72be0d28f26859dfd47d0ac4
AUX openroad_build_fix.patch 21139 BLAKE2B 20092858234d951ab70a4377a58c6724042988bb2172af06d3649b03907884150a9a4d3e3f194b644fd41c9ec82178c351963dd47dc0705ee5e828eaf921eade SHA512 3c44242fc22bb264957311cc43c25aed00c4fc38fc1015e9aef0ec6f57dc4bd01dd221dd74ff57d829ac87e30c16afb2d278a8bf6812efe0c6446310d183f375 AUX openroad_build_fix.patch 21139 BLAKE2B 20092858234d951ab70a4377a58c6724042988bb2172af06d3649b03907884150a9a4d3e3f194b644fd41c9ec82178c351963dd47dc0705ee5e828eaf921eade SHA512 3c44242fc22bb264957311cc43c25aed00c4fc38fc1015e9aef0ec6f57dc4bd01dd221dd74ff57d829ac87e30c16afb2d278a8bf6812efe0c6446310d183f375
EBUILD openroad-9999.ebuild 1091 BLAKE2B fb58b14e0b34347321f1e392fdba5a7478b66b05a253c0035c0e3eb10bd3579e02fd4f8ebbb601aed8476de781eea519397761a84c168d7355d98205f8584d40 SHA512 21ff775a6f8ac7b6cbca179b2cd0ab32091e0096cd8db48c249df86bb184c2c84d7275880485301d686d07d4544124436895b57b7f905a56285a41dc743c992f EBUILD openroad-9999.ebuild 1118 BLAKE2B 7182f1c19ff9b38e14d0f40bc55d3783b188943a646ffb4a8e78be88c4649fa36c087f25461223be80b8f91b29d880e8ad569dc2b7788ed51263f80189122369 SHA512 af473290fc8d5b017dc3860342b125826e808c490a396663d5f239be6086f7441cb0f10ef6ca9cdfa349f5dac9770a4522df716c1dee5589a854151f91b23d6b

View File

@ -0,0 +1,11 @@
diff -Naur openroad-9999_or/include/ord/Design.h openroad-9999/include/ord/Design.h
--- openroad-9999_or/include/ord/Design.h 2023-10-24 13:18:05.744217313 +0200
+++ openroad-9999/include/ord/Design.h 2023-10-24 13:18:46.593757195 +0200
@@ -37,6 +37,7 @@
#include <string>
#include <vector>
+#include <cstdint>
namespace odb {
class dbBlock;

View File

@ -13,6 +13,7 @@ EGIT_SUBMODULES=( '*' )
PATCHES=( PATCHES=(
"${FILESDIR}"/${PN}_build1.patch "${FILESDIR}"/${PN}_build1.patch
${FILESDIR}/cxx13_fix.patch
) )
@ -25,7 +26,7 @@ DEPEND="
dev-cpp/eigen dev-cpp/eigen
sci-libs/lemon sci-libs/lemon
dev-cpp/gtest dev-cpp/gtest
dev-cpp/or-tools sci-libs/or-tools
dev-lang/swig dev-lang/swig
dev-libs/boost dev-libs/boost
" "
@ -39,9 +40,9 @@ BDEPEND="
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
# -DUSE_SYSTEM_ABC=true #-DUSE_SYSTEM_ABC=true
-DUSE_SYSTEM_BOOST=true -DUSE_SYSTEM_BOOST=true
-DCMAKE_CXX_FLAGS="-fPIC -DFMT_DEPRECATED_OSTREAM=1" -DCMAKE_CXX_FLAGS="-DFMT_DEPRECATED_OSTREAM=1"
-DCMAKE_BUILD_TYPE="RELEASE" -DCMAKE_BUILD_TYPE="RELEASE"
-DBUILD_SHARED_LIBS=NO -DBUILD_SHARED_LIBS=NO
) )

View File

@ -2,5 +2,5 @@ AUX build_fix.patch 1208 BLAKE2B ccd4e3ad6994e76421c62112600324f850752dccf0e74e2
AUX cuda_fix.patch 554 BLAKE2B f0609fd0faf38a8bfc15da8ad12c66070f9de6d9f1e1c3748903d1b5fd61ef401c3a0f149a7502b29d9fdd5d8054d0a7367a41734d8e76dbafd5f304a72429f2 SHA512 1c30ca126e4328e86a4fc10f1de9b7686ceca1403b2892f95b0b110df8becfd07540912d0bc6bc92726d1890157d7c8e137db2bad16e37057c2a4c9a42c22c7b AUX cuda_fix.patch 554 BLAKE2B f0609fd0faf38a8bfc15da8ad12c66070f9de6d9f1e1c3748903d1b5fd61ef401c3a0f149a7502b29d9fdd5d8054d0a7367a41734d8e76dbafd5f304a72429f2 SHA512 1c30ca126e4328e86a4fc10f1de9b7686ceca1403b2892f95b0b110df8becfd07540912d0bc6bc92726d1890157d7c8e137db2bad16e37057c2a4c9a42c22c7b
AUX install_fix-7.7.patch 3840 BLAKE2B 7ae7ed2f8e71dd6c44d89d9cab65dc5e3b97232cfb5300b3093934b8d255676ab0cff5499a7c7b07a5fac32c54046a1ac43f40c1cdf53be8c0ca1c71fea8027e SHA512 8d582efadc70d10a304dd30dceef744423291d32b2a56356264f3fead3ad0c848f41153e6085cc50a80330b91c35b71d964fdb20cbbe720b6d5c2289a6dcb106 AUX install_fix-7.7.patch 3840 BLAKE2B 7ae7ed2f8e71dd6c44d89d9cab65dc5e3b97232cfb5300b3093934b8d255676ab0cff5499a7c7b07a5fac32c54046a1ac43f40c1cdf53be8c0ca1c71fea8027e SHA512 8d582efadc70d10a304dd30dceef744423291d32b2a56356264f3fead3ad0c848f41153e6085cc50a80330b91c35b71d964fdb20cbbe720b6d5c2289a6dcb106
DIST Release-7.7.0.zip 24874321 BLAKE2B 8670b90b7fcc815a09dc80e350e3f8007d770969ec4fa0ac1bada13e275b44691db3d6f36d9b229cdcef63429c3f116deb19784c2285573ed3640f9537be4cf8 SHA512 4833800a78c5a89012518febd9c2e28baf22c2e24213013cfd864b827b7f2d49203e46a23fce7349bf8fdb3b86a7b15ef213a40eda47ab2ad06e9ebb6896e185 DIST Release-7.7.0.zip 24874321 BLAKE2B 8670b90b7fcc815a09dc80e350e3f8007d770969ec4fa0ac1bada13e275b44691db3d6f36d9b229cdcef63429c3f116deb19784c2285573ed3640f9537be4cf8 SHA512 4833800a78c5a89012518febd9c2e28baf22c2e24213013cfd864b827b7f2d49203e46a23fce7349bf8fdb3b86a7b15ef213a40eda47ab2ad06e9ebb6896e185
EBUILD xyce-7.7.ebuild 1805 BLAKE2B 0887ff84d602ae867ef771d087467157a96763a06b5840474e2860fbab99d240cdbb203eebc9e21a40045c948d5cce55a24b60edbd451ecea81acad80c15d6a0 SHA512 20be17547b1964b3707826aeaedd5e41e8555a511bd91fe9be20eb68192b4ed35037843d5f8599a6787d531f263b40b6636cfc7269dd972e797d7b8fb75b7bbd EBUILD xyce-7.7.ebuild 1880 BLAKE2B 4bcf354a9e326f1467cbfaa62fe4516f042b71ac97f1e09aa37c9a97764f34ebec5f3164a43186900d5269ccae84ca0c16c18eee3dcfeb785d498f025291c5bc SHA512 635ca98b792267625267dfbe309d525ffcc90a2ec18864fd00ae9b627a6198eaf2e5fa24797d36883fcd1d0dde85976d6dd329c956622be9282ad2521d459ece
EBUILD xyce-9999.ebuild 1805 BLAKE2B 0887ff84d602ae867ef771d087467157a96763a06b5840474e2860fbab99d240cdbb203eebc9e21a40045c948d5cce55a24b60edbd451ecea81acad80c15d6a0 SHA512 20be17547b1964b3707826aeaedd5e41e8555a511bd91fe9be20eb68192b4ed35037843d5f8599a6787d531f263b40b6636cfc7269dd972e797d7b8fb75b7bbd EBUILD xyce-9999.ebuild 1880 BLAKE2B 4bcf354a9e326f1467cbfaa62fe4516f042b71ac97f1e09aa37c9a97764f34ebec5f3164a43186900d5269ccae84ca0c16c18eee3dcfeb785d498f025291c5bc SHA512 635ca98b792267625267dfbe309d525ffcc90a2ec18864fd00ae9b627a6198eaf2e5fa24797d36883fcd1d0dde85976d6dd329c956622be9282ad2521d459ece

View File

@ -19,13 +19,13 @@ else
fi fi
SLOT="0" SLOT="0"
IUSE="cuda openmp" IUSE="cuda openmp metis shylu superlu"
DEPEND=" DEPEND="
sci-libs/fftw openmp? ( sci-libs/fftw[openmp?] )
sci-libs/suitesparse sci-libs/suitesparse
virtual/blas virtual/blas
sci-libs/trilinos sci-libs/trilinos[sparse(+),metis?,shylu?,superlu?]
openmp? ( virtual/mpi[nullmpi(+)] ) openmp? ( virtual/mpi[nullmpi(+)] )
dev-perl/XML-LibXML dev-perl/XML-LibXML
" "

View File

@ -1,4 +1,4 @@
AUX latest_fix.patch 602 BLAKE2B c8bfeb4ee8a83caab7746e74b378d5aa7f64ab9cb67cfc8770aa5b74420010f0944a066a3b436e7f622f99ed4d0e406e5a8b190a20e4339f1c812d361dba9391 SHA512 9d73137ad810fd3c98beb580b9a62f8130a14c629f5879655ad408a7c4125deaf1746d58b088bb105d0ffdb87af56492def4042213b86aed92f8db75d26c9b72 AUX latest_fix.patch 602 BLAKE2B c8bfeb4ee8a83caab7746e74b378d5aa7f64ab9cb67cfc8770aa5b74420010f0944a066a3b436e7f622f99ed4d0e406e5a8b190a20e4339f1c812d361dba9391 SHA512 9d73137ad810fd3c98beb580b9a62f8130a14c629f5879655ad408a7c4125deaf1746d58b088bb105d0ffdb87af56492def4042213b86aed92f8db75d26c9b72
DIST v9.7.zip 22324914 BLAKE2B a388a8af7326a75a6d4802201e0dba0843e557ea91c87786ceef7f03bd84b3a21e5072a4c87fc0d5c724626b49f22d31c3a9941d884042ca5d2e95a7da4511da SHA512 e334a8541137125056421d575d3edf1382cef84222f890e570d479ddfbafca48e1131583c6171503ddb7498e89c43db3daeb8adbdfbfc9891b6f13fdf03fbc9b DIST v9.7.zip 22324914 BLAKE2B a388a8af7326a75a6d4802201e0dba0843e557ea91c87786ceef7f03bd84b3a21e5072a4c87fc0d5c724626b49f22d31c3a9941d884042ca5d2e95a7da4511da SHA512 e334a8541137125056421d575d3edf1382cef84222f890e570d479ddfbafca48e1131583c6171503ddb7498e89c43db3daeb8adbdfbfc9891b6f13fdf03fbc9b
EBUILD or-tools-9.7.ebuild 1889 BLAKE2B 539204056d70f109e49398d52bd918d011ea9bb949df58d8e8c65795f4657ac6fe043b6d5d12b76fee3daca851b88454fbbd092892ab56137edc0936aebf9be5 SHA512 195aafb5ef7a21189e88d05c1a12d6c3b72487a53cdcb91a9d7eb1d505a3be8c3bad69fc6b546eea3bf5164af0d1704415ece7a578863cfaea4b75ed39dc5fa6 EBUILD or-tools-9.7.ebuild 1892 BLAKE2B 71448cdd9a5abfa57da2be5df88810b9ec1a20265650518392f8e516f4e7e9d4e843f0c3b6dc8fca2dc522fd227776ba58046d4d0889c34019548e1c6c15075a SHA512 abce613b031396b186e2171b6ecb6e41faed4732864a0b65eace737f6fec0664706c1e71350ad16160188561b813174fb387e4c71b2ff2019c184eb6129912ac
EBUILD or-tools-9999.ebuild 1889 BLAKE2B 539204056d70f109e49398d52bd918d011ea9bb949df58d8e8c65795f4657ac6fe043b6d5d12b76fee3daca851b88454fbbd092892ab56137edc0936aebf9be5 SHA512 195aafb5ef7a21189e88d05c1a12d6c3b72487a53cdcb91a9d7eb1d505a3be8c3bad69fc6b546eea3bf5164af0d1704415ece7a578863cfaea4b75ed39dc5fa6 EBUILD or-tools-9999.ebuild 1892 BLAKE2B 71448cdd9a5abfa57da2be5df88810b9ec1a20265650518392f8e516f4e7e9d4e843f0c3b6dc8fca2dc522fd227776ba58046d4d0889c34019548e1c6c15075a SHA512 abce613b031396b186e2171b6ecb6e41faed4732864a0b65eace737f6fec0664706c1e71350ad16160188561b813174fb387e4c71b2ff2019c184eb6129912ac

View File

@ -11,9 +11,9 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_BRANCH="main" EGIT_BRANCH="main"
inherit git-r3 inherit git-r3
PATCHES=( #PATCHES=(
${FILESDIR}/latest_fix.patch # ${FILESDIR}/latest_fix.patch
) #)
else else
SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.zip" SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.zip"
fi fi

View File

@ -11,4 +11,4 @@ DIST trilinos-14.4.0.tar.gz 188325969 BLAKE2B 909e3ebe229d035263d835e0d68977516d
EBUILD trilinos-13.4.1.ebuild 9560 BLAKE2B bf029cfd7877ab5377dd8ea76eccc7bfac400500ffefcc01fcb78a11e096a17cd0dd140a9e04686d13ee82f33b96dc35795480faae57411e5fad1d016b30c7d4 SHA512 3819f3abf8889a48ab4e62302cfe6018269d13a0505ee057763cdebbf1fd7d3bf0247b81216b89a372a2d1abb38ac6ed49c28ff07ad84a8a32f28f2b107a691b EBUILD trilinos-13.4.1.ebuild 9560 BLAKE2B bf029cfd7877ab5377dd8ea76eccc7bfac400500ffefcc01fcb78a11e096a17cd0dd140a9e04686d13ee82f33b96dc35795480faae57411e5fad1d016b30c7d4 SHA512 3819f3abf8889a48ab4e62302cfe6018269d13a0505ee057763cdebbf1fd7d3bf0247b81216b89a372a2d1abb38ac6ed49c28ff07ad84a8a32f28f2b107a691b
EBUILD trilinos-14.0.0.ebuild 8451 BLAKE2B d0ca1847ca3f964424304eb9c1abb21d96c7406310d8bccf2049b4aa5267c23878b88352bbd7c23640fa63d903ffa024240e29b988645fbb6cf216bd41ab996b SHA512 cb6774f526e18edf8f94c17f5444982181da7bfefcd18befa8204f97c2ec999209aaeaef9e16df3c567537e891aa905121569183873e2b70883609b7cf2b69bb EBUILD trilinos-14.0.0.ebuild 8451 BLAKE2B d0ca1847ca3f964424304eb9c1abb21d96c7406310d8bccf2049b4aa5267c23878b88352bbd7c23640fa63d903ffa024240e29b988645fbb6cf216bd41ab996b SHA512 cb6774f526e18edf8f94c17f5444982181da7bfefcd18befa8204f97c2ec999209aaeaef9e16df3c567537e891aa905121569183873e2b70883609b7cf2b69bb
EBUILD trilinos-14.2.0.ebuild 8758 BLAKE2B 6abd3955a281d3477b6418b45e3a6008730595ea76ae0731cc66310c62e4b10115d41b9eb7ca0bac6689f91861c9f3a326cd46d81450db97bfc5485094ed477d SHA512 1e4a2753139e70039e4f567c28c27928909eb330599fd0a207a9b3d2af5675599207194b95a23c346ae56787ef341129bffc55916e3ca77aca02d7bd15e88551 EBUILD trilinos-14.2.0.ebuild 8758 BLAKE2B 6abd3955a281d3477b6418b45e3a6008730595ea76ae0731cc66310c62e4b10115d41b9eb7ca0bac6689f91861c9f3a326cd46d81450db97bfc5485094ed477d SHA512 1e4a2753139e70039e4f567c28c27928909eb330599fd0a207a9b3d2af5675599207194b95a23c346ae56787ef341129bffc55916e3ca77aca02d7bd15e88551
EBUILD trilinos-14.4.0.ebuild 8720 BLAKE2B 0b6306a02abf4f289aa82f083ec2784e6b80f2cbbfe7383497e83b76fd95840da9c12dafce44a6430deaefcb921710fa1e1e37564de2732fe40d99cbc3d18255 SHA512 f4f28ce8becaf9268a148a7edde2bb732eecc87134ace5712d609292813d351fde9c9de9bd31d1da478f578693f41c369e499d19941ecfcff3ead739eb8e559b EBUILD trilinos-14.4.0.ebuild 8864 BLAKE2B f9d93b9f77e4fe41a8f24dddf9d2b36fc78c446a242f3174c4a7ae683035646887d500b50e5799d39b1629472ae4171529a120158661cfe342c41885e8c365ff SHA512 a2488476f1a8abe0f37533e5ef051491884c780e653b40bee637aaab2560dc798de87d17142efccc69a443c1371e1d27d49e77bfb68cef67c8b13c957e6f6d8f

View File

@ -19,7 +19,7 @@ SLOT="0"
IUSE=" IUSE="
adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse
superlu taucs tbb test threads tvmet yaml zlib X superlu taucs tbb test threads tvmet yaml zlib X shylu
" "
# TODO: fix export cmake function for tests # TODO: fix export cmake function for tests
@ -45,6 +45,7 @@ RDEPEND="
matio? ( sci-libs/matio ) matio? ( sci-libs/matio )
mkl? ( sci-libs/mkl ) mkl? ( sci-libs/mkl )
metis? ( sci-libs/metis ) metis? ( sci-libs/metis )
metis? ( openmp? ( sci-libs/parmetis ) )
mumps? ( sci-libs/mumps ) mumps? ( sci-libs/mumps )
netcdf? ( sci-libs/netcdf:= ) netcdf? ( sci-libs/netcdf:= )
petsc? ( sci-mathematics/petsc ) petsc? ( sci-mathematics/petsc )
@ -65,6 +66,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
PATCHES=( PATCHES=(
"${FILESDIR}/xyce.patch"
) )
pkg_pretend() { pkg_pretend() {
@ -177,6 +179,8 @@ src_configure() {
-DEpetraExt_BUILD_EXPERIMENTAL=ON -DEpetraExt_BUILD_EXPERIMENTAL=ON
-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON -DEpetraExt_BUILD_GRAPH_REORDERINGS=ON
-DTeuchos_ENABLE_COMPLEX=ON -DTeuchos_ENABLE_COMPLEX=ON
-DTrilinos_ENABLE_ShyLU="$(usex shylu)"
-DTrilinos_ENABLE_ShyLU_NodeTacho="$(usex shylu)"
# error fixes # error fixes
-DTrilinos_ENABLE_COMPLEX=ON -DTrilinos_ENABLE_COMPLEX=ON
-DAmesos_ENABLE_CSparse="$(usex sparse)" -DAmesos_ENABLE_CSparse="$(usex sparse)"
@ -187,9 +191,8 @@ src_configure() {
# more solvers # more solvers
#-DKokkos_ENABLE_THREADS="$(usex threads)" #-DKokkos_ENABLE_THREADS="$(usex threads)"
#-DTpetra_INST_PTHREAD="$(usex threads)" #-DTpetra_INST_PTHREAD="$(usex threads)"
-DTrilinos_ENABLE_ShyLU_NodeTacho=OFF
# #
-DAmesos_ENABLE_ParMETIS=ON -DAmesos_ENABLE_ParMETIS="$(usex metis)"
# Basker solver # Basker solver
-DAmesos2_ENABLE_Basker=ON -DAmesos2_ENABLE_Basker=ON
-DCMAKE_CXX_FLAGS:STRING="-DSHYLU_NODEBASKER" -DCMAKE_CXX_FLAGS:STRING="-DSHYLU_NODEBASKER"