lang/erlang-riak: remove
- broken in all supported FreeBSD releases - unsupported upstream erlang version Approved by: wg (maintainer) Approved by: erlang (with hat)
This commit is contained in:
@@ -56,7 +56,6 @@
|
||||
SUBDIR += erlang-doc
|
||||
SUBDIR += erlang-java
|
||||
SUBDIR += erlang-man
|
||||
SUBDIR += erlang-riak
|
||||
SUBDIR += erlang-runtime21
|
||||
SUBDIR += erlang-runtime22
|
||||
SUBDIR += erlang-runtime23
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
PORTNAME= erlang-riak
|
||||
PORTVERSION= 16.b.02
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/erlang/
|
||||
DISTNAME= otp_src_${ERL_RELEASE}
|
||||
DIST_SUBDIR= erlang
|
||||
|
||||
MAINTAINER= wg@FreeBSD.org
|
||||
COMMENT= Custom erlang from Basho to be used with riak2
|
||||
|
||||
BROKEN_FreeBSD_13= ld: error: duplicate symbol: erts_allctr_wrappers
|
||||
BROKEN_FreeBSD_14= ld: error: duplicate symbol: erts_allctr_wrappers
|
||||
|
||||
WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE}
|
||||
|
||||
ERL_RELEASE= R16B02-basho5
|
||||
|
||||
USES= gmake ncurses perl5 ssl
|
||||
USE_PERL5= build
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFIGURE_ARGS+=--with-ssl=/usr \
|
||||
--disable-hipe \
|
||||
--enable-smp-support \
|
||||
--enable-threads \
|
||||
--enable-kernel-poll \
|
||||
--enable-sctp
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${SSL_DEFAULT} == base
|
||||
BROKEN_FreeBSD_12= error: invalid application of 'sizeof' to an incomplete type 'HMAC_CTX' (aka 'struct hmac_ctx_st')
|
||||
BROKEN_FreeBSD_13= error: invalid application of 'sizeof' to an incomplete type 'HMAC_CTX' (aka 'struct hmac_ctx_st')
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
@@ -1,2 +0,0 @@
|
||||
SHA256 (erlang/otp_src_R16B02-basho5.tar.gz) = 5c36ed749f0f56d003d28ab352fa7cb405f11dbbfb885370edb69d3c1bd321fb
|
||||
SIZE (erlang/otp_src_R16B02-basho5.tar.gz) = 33528087
|
||||
@@ -1,20 +0,0 @@
|
||||
--- Makefile.in.orig 2015-03-17 09:51:51 UTC
|
||||
+++ Makefile.in
|
||||
@@ -59,7 +59,7 @@ bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
|
||||
# Where Erlang/OTP is located
|
||||
-libdir_suffix = /erlang
|
||||
+libdir_suffix = /riak-erlang
|
||||
erlang_libdir = $(libdir)$(libdir_suffix)
|
||||
erlang_bindir = $(erlang_libdir)/bin
|
||||
|
||||
@@ -921,7 +921,7 @@ $(TEST_DIRS):
|
||||
#
|
||||
# Order is important here, don't change it!
|
||||
#
|
||||
-INST_DEP += install.dirs install.emulator install.libs install.Install install.bin
|
||||
+INST_DEP += install.dirs install.emulator install.libs install.Install
|
||||
|
||||
install: $(INST_DEP)
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
commit 5a00e724a58ee29d4012cca79c8aa33979e74eb6
|
||||
Author: Sverker Eriksson <sverker@erlang.org>
|
||||
Date: Wed Nov 20 21:33:20 2013 +0100
|
||||
|
||||
erts: Fix alignment bug in allocator start code
|
||||
|
||||
Bug never released.
|
||||
|
||||
diff --git erts/emulator/beam/erl_alloc_util.c erts/emulator/beam/erl_alloc_util.c
|
||||
index 1fdee4d..00b87ac 100644
|
||||
--- erts/emulator/beam/erl_alloc_util.c
|
||||
+++ erts/emulator/beam/erl_alloc_util.c
|
||||
@@ -372,6 +372,8 @@ do { \
|
||||
|
||||
#define ERTS_CRR_ALCTR_FLG_IN_POOL (((erts_aint_t) 1) << 0)
|
||||
#define ERTS_CRR_ALCTR_FLG_BUSY (((erts_aint_t) 1) << 1)
|
||||
+#define ERTS_CRR_ALCTR_FLG_MASK (ERTS_CRR_ALCTR_FLG_IN_POOL | \
|
||||
+ ERTS_CRR_ALCTR_FLG_BUSY)
|
||||
|
||||
#ifdef ERTS_SMP
|
||||
#define SBC_HEADER_SIZE \
|
||||
@@ -1404,14 +1406,14 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
|
||||
|
||||
if (ERTS_ALC_TS_PREF_LOCK_IF_USED == pref_lock
|
||||
&& pref_allctr->thread_safe) {
|
||||
- used_allctr = (Allctr_t *) (iallctr & ~FLG_MASK);
|
||||
+ used_allctr = (Allctr_t *) (iallctr & ~ERTS_CRR_ALCTR_FLG_MASK);
|
||||
if (pref_allctr == used_allctr) {
|
||||
erts_mtx_lock(&pref_allctr->mutex);
|
||||
locked_pref_allctr = 1;
|
||||
}
|
||||
}
|
||||
|
||||
- while ((iallctr & ((~FLG_MASK)|ERTS_CRR_ALCTR_FLG_IN_POOL))
|
||||
+ while ((iallctr & ((~ERTS_CRR_ALCTR_FLG_MASK)|ERTS_CRR_ALCTR_FLG_IN_POOL))
|
||||
== (((erts_aint_t) pref_allctr)|ERTS_CRR_ALCTR_FLG_IN_POOL)) {
|
||||
erts_aint_t act;
|
||||
|
||||
@@ -1426,7 +1428,7 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
|
||||
iallctr = act;
|
||||
}
|
||||
|
||||
- used_allctr = (Allctr_t *) (iallctr & ~FLG_MASK);
|
||||
+ used_allctr = (Allctr_t *) (iallctr & ~ERTS_CRR_ALCTR_FLG_MASK);
|
||||
|
||||
if (ERTS_ALC_TS_PREF_LOCK_IF_USED == pref_lock) {
|
||||
if (locked_pref_allctr && used_allctr != pref_allctr) {
|
||||
@@ -1436,16 +1438,16 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
|
||||
}
|
||||
|
||||
ERTS_ALC_CPOOL_ASSERT(
|
||||
- (((iallctr & ~FLG_MASK) == (erts_aint_t) pref_allctr)
|
||||
- ? (((iallctr & FLG_MASK) == ERTS_CRR_ALCTR_FLG_IN_POOL)
|
||||
- || ((iallctr & FLG_MASK) == 0))
|
||||
+ (((iallctr & ~ERTS_CRR_ALCTR_FLG_MASK) == (erts_aint_t) pref_allctr)
|
||||
+ ? (((iallctr & ERTS_CRR_ALCTR_FLG_MASK) == ERTS_CRR_ALCTR_FLG_IN_POOL)
|
||||
+ || ((iallctr & ERTS_CRR_ALCTR_FLG_MASK) == 0))
|
||||
: 1));
|
||||
|
||||
return used_allctr;
|
||||
}
|
||||
}
|
||||
|
||||
- used_allctr = (Allctr_t *) (iallctr & ~FLG_MASK);
|
||||
+ used_allctr = (Allctr_t *) (iallctr & ~ERTS_CRR_ALCTR_FLG_MASK);
|
||||
|
||||
if (ERTS_ALC_TS_PREF_LOCK_IF_USED == pref_lock
|
||||
&& used_allctr == pref_allctr
|
||||
@@ -1776,7 +1778,7 @@ handle_delayed_dealloc(Allctr_t *allctr,
|
||||
ERTS_ALC_CPOOL_ASSERT(allctr == crr->cpool.orig_allctr);
|
||||
ERTS_ALC_CPOOL_ASSERT(((erts_aint_t) allctr)
|
||||
!= (erts_smp_atomic_read_nob(&crr->allctr)
|
||||
- & ~FLG_MASK));
|
||||
+ & ~ERTS_CRR_ALCTR_FLG_MASK));
|
||||
|
||||
erts_smp_atomic_set_nob(&crr->allctr, ((erts_aint_t) allctr));
|
||||
|
||||
@@ -2919,7 +2921,7 @@ cpool_fetch(Allctr_t *allctr, UWord size)
|
||||
#ifdef ERTS_ALC_CPOOL_DEBUG
|
||||
ERTS_ALC_CPOOL_ASSERT(erts_smp_atomic_xchg_nob(&crr->allctr,
|
||||
((erts_aint_t) allctr))
|
||||
- == (((erts_aint_t) allctr) & ~FLG_MASK));
|
||||
+ == (((erts_aint_t) allctr) & ~ERTS_CRR_ALCTR_FLG_MASK));
|
||||
#else
|
||||
erts_smp_atomic_set_nob(&crr->allctr, ((erts_aint_t) allctr));
|
||||
#endif
|
||||
@@ -2961,7 +2963,7 @@ cpool_fetch(Allctr_t *allctr, UWord size)
|
||||
(erts_aint_t) allctr,
|
||||
exp);
|
||||
if (act == exp) {
|
||||
- cpool_delete(allctr, ((Allctr_t *) (act & ~FLG_MASK)), crr);
|
||||
+ cpool_delete(allctr, ((Allctr_t *) (act & ~ERTS_CRR_ALCTR_FLG_MASK)), crr);
|
||||
return crr;
|
||||
}
|
||||
}
|
||||
@@ -3056,7 +3058,7 @@ schedule_dealloc_carrier(Allctr_t *allctr, Carrier_t *crr)
|
||||
ERTS_ALC_CPOOL_ASSERT(crr == FIRST_BLK_TO_MBC(allctr, blk));
|
||||
ERTS_ALC_CPOOL_ASSERT(((erts_aint_t) allctr)
|
||||
== (erts_smp_atomic_read_nob(&crr->allctr)
|
||||
- & ~FLG_MASK));
|
||||
+ & ~ERTS_CRR_ALCTR_FLG_MASK));
|
||||
|
||||
if (ddq_enqueue(&orig_allctr->dd.q, BLK2UMEM(blk), cinit))
|
||||
erts_alloc_notify_delayed_dealloc(orig_allctr->ix);
|
||||
@@ -5422,6 +5424,11 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
|
||||
{
|
||||
/* erts_alcu_start assumes that allctr has been zeroed */
|
||||
|
||||
+ if (((UWord)allctr & ERTS_CRR_ALCTR_FLG_MASK) != 0) {
|
||||
+ erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n",
|
||||
+ __FILE__, __LINE__);
|
||||
+ }
|
||||
+
|
||||
if (!initialized)
|
||||
goto error;
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
Basho's patched version of Erlang to install Riak 2.0
|
||||
|
||||
WWW: http://docs.basho.com/riak/latest/ops/building/installing/erlang/
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user