diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/antlr/antlr-4.13.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcmail/bcmail-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcpg/bcpg-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcpkix/bcpkix-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcprov/bcprov-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/bcutil/bcutil-1.82.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch | 170 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch | 191 | ||||
| -rw-r--r-- | dev-java/typesafe-config/typesafe-config-1.4.5.ebuild | 2 |
9 files changed, 7 insertions, 368 deletions
diff --git a/dev-java/antlr/antlr-4.13.2.ebuild b/dev-java/antlr/antlr-4.13.2.ebuild index 68c55cd7ca30..8ffe291d46af 100644 --- a/dev-java/antlr/antlr-4.13.2.ebuild +++ b/dev-java/antlr/antlr-4.13.2.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}4-${PV}" LICENSE="BSD" SLOT="4" -KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" CP_DEPEND=" ~dev-java/antlr-runtime-${PV}:${SLOT} diff --git a/dev-java/bcmail/bcmail-1.82.ebuild b/dev-java/bcmail/bcmail-1.82.ebuild index 505b65913254..18a40c03c21f 100644 --- a/dev-java/bcmail/bcmail-1.82.ebuild +++ b/dev-java/bcmail/bcmail-1.82.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/mail" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcpkix-${PV}:0 diff --git a/dev-java/bcpg/bcpg-1.82.ebuild b/dev-java/bcpg/bcpg-1.82.ebuild index 84aab576c5c3..fcbcab8c5f20 100644 --- a/dev-java/bcpg/bcpg-1.82.ebuild +++ b/dev-java/bcpg/bcpg-1.82.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcpkix/bcpkix-1.82.ebuild b/dev-java/bcpkix/bcpkix-1.82.ebuild index 179c94d786e2..b855873434eb 100644 --- a/dev-java/bcpkix/bcpkix-1.82.ebuild +++ b/dev-java/bcpkix/bcpkix-1.82.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcprov/bcprov-1.82.ebuild b/dev-java/bcprov/bcprov-1.82.ebuild index a2a4e643869b..afd21f24adca 100644 --- a/dev-java/bcprov/bcprov-1.82.ebuild +++ b/dev-java/bcprov/bcprov-1.82.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" # Restricted to max jdk:21 to avoid test failures with higher jdk versions. DEPEND="|| ( virtual/jdk:21 virtual/jdk:17 virtual/jdk:11 )" diff --git a/dev-java/bcutil/bcutil-1.82.ebuild b/dev-java/bcutil/bcutil-1.82.ebuild index 2fb8d6cf2a9c..90642cf8c4af 100644 --- a/dev-java/bcutil/bcutil-1.82.ebuild +++ b/dev-java/bcutil/bcutil-1.82.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/util" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CDEPEND="~dev-java/bcprov-${PV}:0" diff --git a/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch deleted file mode 100644 index 040b257d144f..000000000000 --- a/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 4241313127be05704eeebcc6454120742cc93753 Mon Sep 17 00:00:00 2001 -From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> -Date: Thu, 12 Jun 2025 16:21:01 +0000 -Subject: [PATCH] 8354941: Build failure with glibc 2.42 due to uabs() name - collision - -Reviewed-by: phh -Backport-of: 38bb8adf4f632b08af15f2d8530b35f05f86a020 ---- - src/hotspot/cpu/aarch64/assembler_aarch64.cpp | 2 +- - src/hotspot/cpu/aarch64/assembler_aarch64.hpp | 2 +- - src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +- - src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp | 4 ++-- - src/hotspot/cpu/riscv/assembler_riscv.hpp | 2 +- - src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 4 ++-- - src/hotspot/share/opto/mulnode.cpp | 4 ++-- - src/hotspot/share/utilities/globalDefinitions.hpp | 8 ++++---- - 8 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -index 0c503e0b7fd..70a750f0043 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -@@ -318,7 +318,7 @@ void Assembler::wrap_label(Label &L, prfop op, prefetch_insn insn) { - - bool Assembler::operand_valid_for_add_sub_immediate(int64_t imm) { - bool shift = false; -- uint64_t uimm = (uint64_t)uabs((jlong)imm); -+ uint64_t uimm = (uint64_t)g_uabs((jlong)imm); - if (uimm < (1 << 12)) - return true; - if (uimm < (1 << 24) -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -index 5a8047bc2af..12fff1972bd 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -@@ -858,7 +858,7 @@ class Assembler : public AbstractAssembler { - static const uint64_t branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M); - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Unconditional branch (immediate) -diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -index 7abb2205414..c9a8db901e4 100644 ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -@@ -2410,7 +2410,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im - if (fits) { - (this->*insn1)(Rd, Rn, imm); - } else { -- if (uabs(imm) < (1 << 24)) { -+ if (g_uabs(imm) < (1 << 24)) { - (this->*insn1)(Rd, Rn, imm & -(1 << 12)); - (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1)); - } else { -diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -index c92f0cf05bd..4920b7cb47c 100644 ---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -@@ -1042,7 +1042,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_small(Register s, Register d, Register count, Register tmp, int step) { - bool is_backwards = step < 0; -- size_t granularity = uabs(step); -+ size_t granularity = g_uabs(step); - int direction = is_backwards ? -1 : 1; - int unit = wordSize * direction; - -@@ -1098,7 +1098,7 @@ class StubGenerator: public StubCodeGenerator { - Register count, Register tmp, int step) { - copy_direction direction = step < 0 ? copy_backwards : copy_forwards; - bool is_backwards = step < 0; -- unsigned int granularity = uabs(step); -+ unsigned int granularity = g_uabs(step); - const Register t0 = r3, t1 = r4; - - // <= 80 (or 96 for SIMD) bytes do inline. Direction doesn't matter because we always -diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp -index 98c51e9883d..31a8f59f802 100644 ---- a/src/hotspot/cpu/riscv/assembler_riscv.hpp -+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp -@@ -2779,7 +2779,7 @@ enum Nf { - static const unsigned long branch_range = 1 * M; - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Decode the given instruction, checking if it's a 16-bit compressed -diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -index 7fe0392ea5c..a0ebb34a548 100644 ---- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -@@ -925,7 +925,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) { - bool is_backward = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; - assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2); -@@ -974,7 +974,7 @@ class StubGenerator: public StubCodeGenerator { - } - - bool is_backwards = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17, tmp5 = x14, tmp6 = x13; - -diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp -index 6d35fd8bf7b..6eb47eb38bb 100644 ---- a/src/hotspot/share/opto/mulnode.cpp -+++ b/src/hotspot/share/opto/mulnode.cpp -@@ -242,7 +242,7 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) { - // Check for negative constant; if so negate the final result - bool sign_flip = false; - -- unsigned int abs_con = uabs(con); -+ unsigned int abs_con = g_uabs(con); - if (abs_con != (unsigned int)con) { - sign_flip = true; - } -@@ -336,7 +336,7 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) { - - // Check for negative constant; if so negate the final result - bool sign_flip = false; -- julong abs_con = uabs(con); -+ julong abs_con = g_uabs(con); - if (abs_con != (julong)con) { - sign_flip = true; - } -diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp -index 98d7fbc674c..d5840b0c001 100644 ---- a/src/hotspot/share/utilities/globalDefinitions.hpp -+++ b/src/hotspot/share/utilities/globalDefinitions.hpp -@@ -1064,7 +1064,7 @@ inline bool is_even(intx x) { return !is_odd(x); } - - // abs methods which cannot overflow and so are well-defined across - // the entire domain of integer types. --static inline unsigned int uabs(unsigned int n) { -+static inline unsigned int g_uabs(unsigned int n) { - union { - unsigned int result; - int value; -@@ -1073,7 +1073,7 @@ static inline unsigned int uabs(unsigned int n) { - if (value < 0) result = 0-result; - return result; - } --static inline julong uabs(julong n) { -+static inline julong g_uabs(julong n) { - union { - julong result; - jlong value; -@@ -1082,8 +1082,8 @@ static inline julong uabs(julong n) { - if (value < 0) result = 0-result; - return result; - } --static inline julong uabs(jlong n) { return uabs((julong)n); } --static inline unsigned int uabs(int n) { return uabs((unsigned int)n); } -+static inline julong g_uabs(jlong n) { return g_uabs((julong)n); } -+static inline unsigned int g_uabs(int n) { return g_uabs((unsigned int)n); } - - // "to" should be greater than "from." - inline intx byte_size(void* from, void* to) { diff --git a/dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch deleted file mode 100644 index b5ffdf580067..000000000000 --- a/dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 3445b99bedfba659da49d72a39979703969cfc91 Mon Sep 17 00:00:00 2001 -From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> -Date: Fri, 6 Jun 2025 14:29:04 +0000 -Subject: [PATCH] 8354941: Build failure with glibc 2.42 due to uabs() name - collision - -Backport-of: 38bb8adf4f632b08af15f2d8530b35f05f86a020 ---- - src/hotspot/cpu/aarch64/assembler_aarch64.cpp | 2 +- - src/hotspot/cpu/aarch64/assembler_aarch64.hpp | 2 +- - src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +- - src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp | 4 ++-- - src/hotspot/cpu/riscv/assembler_riscv.hpp | 2 +- - src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 4 ++-- - src/hotspot/share/opto/mulnode.cpp | 4 ++-- - src/hotspot/share/opto/subnode.cpp | 4 ++-- - src/hotspot/share/utilities/globalDefinitions.hpp | 8 ++++---- - 9 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -index c7b867a4207..fab224847f4 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -@@ -461,7 +461,7 @@ void Assembler::bang_stack_with_offset(int offset) { Unimplemented(); } - - bool asm_util::operand_valid_for_immediate_bits(int64_t imm, unsigned nbits) { - guarantee(nbits == 8 || nbits == 12, "invalid nbits value"); -- uint64_t uimm = (uint64_t)uabs((jlong)imm); -+ uint64_t uimm = (uint64_t)g_uabs((jlong)imm); - if (uimm < (UCONST64(1) << nbits)) - return true; - if (uimm < (UCONST64(1) << (2 * nbits)) -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -index dafb4f5229b..5d3ca441b41 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -@@ -930,7 +930,7 @@ class Assembler : public AbstractAssembler { - static const uint64_t branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M); - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Unconditional branch (immediate) -diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -index 0a2dd0dce97..8ec1af1bd7a 100644 ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -@@ -2894,7 +2894,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im - if (fits) { - (this->*insn1)(Rd, Rn, imm); - } else { -- if (uabs(imm) < (1 << 24)) { -+ if (g_uabs(imm) < (1 << 24)) { - (this->*insn1)(Rd, Rn, imm & -(1 << 12)); - (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1)); - } else { -diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -index b2cc462ff8e..2bfc49d05dd 100644 ---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -@@ -1130,7 +1130,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_small(DecoratorSet decorators, BasicType type, Register s, Register d, Register count, int step) { - bool is_backwards = step < 0; -- size_t granularity = uabs(step); -+ size_t granularity = g_uabs(step); - int direction = is_backwards ? -1 : 1; - - Label Lword, Lint, Lshort, Lbyte; -@@ -1189,7 +1189,7 @@ class StubGenerator: public StubCodeGenerator { - Register s, Register d, Register count, int step) { - copy_direction direction = step < 0 ? copy_backwards : copy_forwards; - bool is_backwards = step < 0; -- unsigned int granularity = uabs(step); -+ unsigned int granularity = g_uabs(step); - const Register t0 = r3, t1 = r4; - - // <= 80 (or 96 for SIMD) bytes do inline. Direction doesn't matter because we always -diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp -index 24de7c15fe3..afb661e180d 100644 ---- a/src/hotspot/cpu/riscv/assembler_riscv.hpp -+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp -@@ -2913,7 +2913,7 @@ enum Nf { - static const unsigned long branch_range = 1 * M; - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Decode the given instruction, checking if it's a 16-bit compressed -diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -index 8c5e1c097ef..bc4d2e94414 100644 ---- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -@@ -917,7 +917,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_v(Register s, Register d, Register count, int step) { - bool is_backward = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; - assert_different_registers(s, d, cnt, vl, tmp1, tmp2); -@@ -973,7 +973,7 @@ class StubGenerator: public StubCodeGenerator { - } - - bool is_backwards = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17, tmp5 = x14, tmp6 = x13; - const Register gct1 = x28, gct2 = x29, gct3 = t2; -diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp -index f42d06a3650..43d842173dd 100644 ---- a/src/hotspot/share/opto/mulnode.cpp -+++ b/src/hotspot/share/opto/mulnode.cpp -@@ -245,7 +245,7 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) { - // Check for negative constant; if so negate the final result - bool sign_flip = false; - -- unsigned int abs_con = uabs(con); -+ unsigned int abs_con = g_uabs(con); - if (abs_con != (unsigned int)con) { - sign_flip = true; - } -@@ -480,7 +480,7 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) { - - // Check for negative constant; if so negate the final result - bool sign_flip = false; -- julong abs_con = uabs(con); -+ julong abs_con = g_uabs(con); - if (abs_con != (julong)con) { - sign_flip = true; - } -diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp -index 8b2538f8ab5..c4a86d76506 100644 ---- a/src/hotspot/share/opto/subnode.cpp -+++ b/src/hotspot/share/opto/subnode.cpp -@@ -1899,14 +1899,14 @@ const Type* AbsNode::Value(PhaseGVN* phase) const { - case Type::Int: { - const TypeInt* ti = t1->is_int(); - if (ti->is_con()) { -- return TypeInt::make(uabs(ti->get_con())); -+ return TypeInt::make(g_uabs(ti->get_con())); - } - break; - } - case Type::Long: { - const TypeLong* tl = t1->is_long(); - if (tl->is_con()) { -- return TypeLong::make(uabs(tl->get_con())); -+ return TypeLong::make(g_uabs(tl->get_con())); - } - break; - } -diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp -index 0083442be6c..625fdcc414f 100644 ---- a/src/hotspot/share/utilities/globalDefinitions.hpp -+++ b/src/hotspot/share/utilities/globalDefinitions.hpp -@@ -1164,7 +1164,7 @@ inline bool is_even(intx x) { return !is_odd(x); } - - // abs methods which cannot overflow and so are well-defined across - // the entire domain of integer types. --static inline unsigned int uabs(unsigned int n) { -+static inline unsigned int g_uabs(unsigned int n) { - union { - unsigned int result; - int value; -@@ -1173,7 +1173,7 @@ static inline unsigned int uabs(unsigned int n) { - if (value < 0) result = 0-result; - return result; - } --static inline julong uabs(julong n) { -+static inline julong g_uabs(julong n) { - union { - julong result; - jlong value; -@@ -1182,8 +1182,8 @@ static inline julong uabs(julong n) { - if (value < 0) result = 0-result; - return result; - } --static inline julong uabs(jlong n) { return uabs((julong)n); } --static inline unsigned int uabs(int n) { return uabs((unsigned int)n); } -+static inline julong g_uabs(jlong n) { return g_uabs((julong)n); } -+static inline unsigned int g_uabs(int n) { return g_uabs((unsigned int)n); } - - // "to" should be greater than "from." - inline intx byte_size(void* from, void* to) { diff --git a/dev-java/typesafe-config/typesafe-config-1.4.5.ebuild b/dev-java/typesafe-config/typesafe-config-1.4.5.ebuild index f6e332424d76..28432f9f4f40 100644 --- a/dev-java/typesafe-config/typesafe-config-1.4.5.ebuild +++ b/dev-java/typesafe-config/typesafe-config-1.4.5.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/config-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc64" +KEYWORDS="amd64 ppc64" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" |
