diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-19 21:52:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-19 21:52:41 +0100 |
| commit | 67efaff61522aeb024152ab6cddf7c40ffacb530 (patch) | |
| tree | 294409103a6f391c6c9d317b2dde60cbf1f035e7 /eclass | |
| parent | f827ced0163cc11d6d35e2d4e2c8a7ab3fd6482a (diff) | |
gentoo auto-resync : 19:10:2023 - 21:52:41
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39147 -> 39136 bytes | |||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 10 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 3 | ||||
| -rw-r--r-- | eclass/llvm.org.eclass | 9 |
4 files changed, 11 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 5b2093683ee8..a61d17128988 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index ea4833727ea1..143efa707751 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -485,8 +485,11 @@ java-pkg-simple_src_install() { # @FUNCTION: java-pkg-simple_src_test # @DESCRIPTION: # src_test for simple single java jar file. -# It will perform test with frameworks that are defined in -# ${JAVA_TESTING_FRAMEWORKS}. +# It will compile test classes from test sources using ejavac and perform tests +# with frameworks that are defined in ${JAVA_TESTING_FRAMEWORKS}. +# test-classes compiled with alternative compilers like groovyc need to be placed +# in the "generated-test" directory as content of this directory is preserved, +# whereas content of target/test-classes is removed. java-pkg-simple_src_test() { local test_sources=test_sources.lst classes=target/test-classes moduleinfo local tests_to_run classpath @@ -502,12 +505,13 @@ java-pkg-simple_src_test() { fi # https://bugs.gentoo.org/906311 + # This will remove target/test-classes. Do not put any test-classes there manually. rm -rf ${classes} || die # create the target directory mkdir -p ${classes} || die "Could not create target directory for testing" - # generated test classes should get generated into "generated-test" directory + # generated test classes should get compiled into "generated-test" directory if [[ -d generated-test ]]; then cp -r generated-test/* "${classes}" || die "cannot copy generated test classes" fi diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 8bab2b482cf7..5ecd97c173ff 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -304,7 +304,6 @@ RESTRICT="binchecks strip" # set LINUX_HOSTCFLAGS if not already set : "${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"}" - # @FUNCTION: debug-print-kernel2-variables # @USAGE: # @DESCRIPTION: @@ -665,7 +664,7 @@ if [[ ${ETYPE} == sources ]]; then virtual/pkgconfig )" - SLOT="${PVR}" + SLOT=${SLOT:=${PVR}} DESCRIPTION="Sources based on the Linux Kernel" IUSE="symlink build" diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 9bffc118f265..b1071c15aba0 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,15 +72,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 18.0.0_pre20231019) + EGIT_COMMIT=e6e90840708099425b7b69dd053634ff25d4907f + ;; 18.0.0_pre20231013) EGIT_COMMIT=5d35273a32d239b7407338e13ed71b59174d6536 ;; - 18.0.0_pre20231002) - EGIT_COMMIT=39fec5457c0925bd39f67f63fe17391584e08258 - ;; - 18.0.0_pre20230925) - EGIT_COMMIT=f5cb9cb59d7c9c6ac3d5c41c677f68c9b75d34a3 - ;; *) die "Unknown snapshot: ${PV}" ;; |