Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sci-physics/{oneloop,cuttools,openloops}: add {3.6, 1.8.2, 2.1.2} #1267

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

APN-Pucky
Copy link
Contributor

@APN-Pucky APN-Pucky commented Apr 17, 2024

At least two imminent bigger problems here (before I clean it up further):

  • kind_types.f90 is from openloops2, which I'd link to PR sooner or later, since they modified oneloop I'd include these changes here. Alternatively, openloops2 could just use their own version of oneloop, but that seems a bit wrong (unless they perform many more changes).
  • I dropped the 2020.07.31, since I found a the latest official version 3.6 and therefore the 2020.07.31 version is just from the bitbucket and should be called 3.6_p2020.07.31, IMO.
  • Maybe I should just throw the openloops PR inside of here too?

How does Gentoo typically handle these (rare science mess) cases?

Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
sci-physics/oneloop/oneloop-3.6.ebuild Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6.ebuild Outdated Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6.ebuild Outdated Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6.ebuild Outdated Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6.ebuild Outdated Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6.ebuild Outdated Show resolved Hide resolved
sci-physics/oneloop/oneloop-3.6_p20200731.ebuild Outdated Show resolved Hide resolved
@AndrewAmmerlaan
Copy link
Member

How does Gentoo typically handle these (rare science mess) cases?

Do I understand correctly that this bundles a modified version of a dependency?

In this case I would say it depends on which modifications they made and how many. If the changes are generally useful I think we can patch the dependency in its own package. Otherwise I think the bundled dependency should be in SRC_URI.

Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
@APN-Pucky
Copy link
Contributor Author

How does Gentoo typically handle these (rare science mess) cases?

Do I understand correctly that this bundles a modified version of a dependency?

In this case I would say it depends on which modifications they made and how many. If the changes are generally useful I think we can patch the dependency in its own package. Otherwise I think the bundled dependency should be in SRC_URI.

I guess I'll add the other stuff here too, so one can explicitly check that it works with the final package.

Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
@APN-Pucky APN-Pucky changed the title sci-physics/oneloop: add 3.6, drop 2020.07.31 sci-physics/{oneloop,cuttools,openloops}: add {3.6, 1.8.2, 2.1.2} May 7, 2024
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
sci-physics/cuttools/cuttools-1.8.2.ebuild Outdated Show resolved Hide resolved
Comment on lines 29 to 30
use dummy && cp "${FILESDIR}"/mpnumdummy.f90 src/cts/mpnumdummy.f90
use dummy && sed -i 's/CTS =/CTS = mpnumdummy.o/' src/makefile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should || die, so we need a proper if statement here.

src_compile() {
emake -j1 FFLAGS="${FFLAGS} -I${ESYSROOT}/usr/include -fPIC -std=legacy"
tc-export AR CXX
cd includects
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cd includects
cd includects || die

Comment on lines 37 to 38
${AR} -x libcts.a
${CXX} -shared *.o -o lib${PN}.so
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
${AR} -x libcts.a
${CXX} -shared *.o -o lib${PN}.so
${AR} -x libcts.a || die
${CXX} ${CXXFLAGS} -shared *.o -o lib${PN}.so || die

sci-physics/cuttools/cuttools-1.8.2.ebuild Outdated Show resolved Hide resolved
Comment on lines 23 to 25
BDEPEND="
virtual/fortran
"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fortran-2.eclass :P

Copy link
Contributor Author

@APN-Pucky APN-Pucky May 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am going to patch that now into my pkgcheck... or maybe event PR it to pkgcheck 🤔


src_prepare() {
default
mv openloops.cfg.tmpl openloops.cfg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mv openloops.cfg.tmpl openloops.cfg
mv openloops.cfg.tmpl openloops.cfg || die

Comment on lines 45 to 60
cat << EOF >> openloops.cfg || die
compile_libraries = rambo trred
link_libraries = $(usev collier) $(usev cuttools)
ccflags = ${CFLAGS}
cxxflags = ${CXXFLAGS}
f_flags = ${FFLAGS} -I${ESYSROOT}/usr/include/ -I${ESYSROOT}/usr/include/cuttools -lcollier
link_flags = ${LDFLAGS} -I${ESYSROOT}/usr/include/ -I${ESYSROOT}/usr/include/cuttools -lcollier
cc = $(tc-getCC)
cxx = $(tc-getCXX)
fortran_compiler = $(tc-getFC)
process_src_dir = ${EPREFIX}/opt/${MY_P}/process_src/
process_obj_dir = ${EPREFIX}/opt/${MY_P}/process_obj/
process_lib_dir = ${EPREFIX}/opt/${MY_P}/proclib/
release = $PV
import_env = @all
EOF
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you can also use -EOF instead so you can use indentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants