update to otp_src_R10B-9
based on older submissions to ports@ tested by Hannah Schroeter <hannah at schlund.de>
This commit is contained in:
parent
ce98d2f845
commit
176f5dac2c
@ -1,30 +1,27 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2005/11/03 18:28:55 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2006/03/07 19:30:36 sturm Exp $
|
||||
|
||||
COMMENT= "Ericsson's high-level functional programming language"
|
||||
|
||||
VERSION= 47.4.0
|
||||
DISTNAME= erlang-${VERSION}
|
||||
CATEGORIES= lang
|
||||
DISTNAME= otp_src_R10B-9
|
||||
PKGNAME= erlang-10B_9
|
||||
CATEGORIES= lang
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c termcap m pthread
|
||||
WANTLIB= c crypto m ncurses pthread ssl
|
||||
|
||||
MASTER_SITES= http://erlang.stacken.kth.se/download/ \
|
||||
http://www.erlang.org/download/
|
||||
EXTRACT_SUFX= .base.tar.gz
|
||||
MASTER_SITES= http://www.erlang.org/download/
|
||||
|
||||
USE_GMAKE= Yes
|
||||
AUTOCONF_VERSION= 2.13
|
||||
CONFIGURE_STYLE= autoconf
|
||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/erts-${VERSION}/autoconf
|
||||
CONFIGURE_ARGS= --disable-jinterface \
|
||||
--enable-threads \
|
||||
--enable-kernel-poll
|
||||
|
||||
NO_REGRESS= Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE=autoconf
|
||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/erts/autoconf
|
||||
|
||||
post-configure:
|
||||
@cd ${WRKSRC}/erts-47.4.0/autoconf && \
|
||||
${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
MD5 (erlang-47.4.0.base.tar.gz) = a05fbaf7eee78e320315ed4436349b22
|
||||
RMD160 (erlang-47.4.0.base.tar.gz) = 6468934c50a38ec8536333fc53bc6eb871d7cb44
|
||||
SHA1 (erlang-47.4.0.base.tar.gz) = a6e9d5bda92a3ad7caf39bc8bf5c3734410c4ee4
|
||||
SIZE (erlang-47.4.0.base.tar.gz) = 2349970
|
||||
MD5 (otp_src_R10B-9.tar.gz) = 05791e9097f36202eb705df2a1db6500
|
||||
RMD160 (otp_src_R10B-9.tar.gz) = e92b655d3250a6dd4c11106fbc0fb0626a5cf6e9
|
||||
SHA1 (otp_src_R10B-9.tar.gz) = 2255209fca6101e39d7e3d5af2c074239e29d79d
|
||||
SIZE (otp_src_R10B-9.tar.gz) = 9961340
|
||||
|
@ -1,82 +1,41 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2001/10/20 13:31:26 naddy Exp $
|
||||
--- Makefile.in.orig Sun Oct 14 18:13:32 2001
|
||||
+++ Makefile.in Sun Oct 14 18:15:06 2001
|
||||
@@ -70,8 +70,8 @@ new_libraries:
|
||||
# Order is important here, don't change it!
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2006/03/07 19:30:36 sturm Exp $
|
||||
--- Makefile.in.orig Mon Oct 24 11:43:23 2005
|
||||
+++ Makefile.in Tue Feb 14 08:09:24 2006
|
||||
@@ -49,8 +49,7 @@ exec_prefix = @exec_prefix@
|
||||
# useful e.g. when installing on a server that stores the files with a
|
||||
# different path from where the clients access them. Or when building
|
||||
# rpms.
|
||||
-#INSTALL_PREFIX =
|
||||
-# Naah...override `prefix' instead.
|
||||
+INSTALL_PREFIX = $(DESTDIR)
|
||||
|
||||
# The directory in which user executables (erl, erlc and erl_call) are put
|
||||
BINDIR = $(INSTALL_PREFIX)@bindir@
|
||||
@@ -524,7 +523,7 @@ else
|
||||
endif
|
||||
|
||||
install.Install:
|
||||
- cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_LIBDIR)
|
||||
+ cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_ILIBDIR)
|
||||
|
||||
#
|
||||
install: install.dirs install.ertsbin install.bin install.lib
|
||||
- ${INSTALL_PROGRAM} erts/bin/$(TARGET)/erlc ${BINDIR}/erlc
|
||||
- ${INSTALL_PROGRAM} ${ERLANG_BINDIR}/erl ${BINDIR}/erl
|
||||
+ ${INSTALL_PROGRAM} erts/bin/$(TARGET)/erlc $(DESTDIR)${BINDIR}/erlc
|
||||
+ ${INSTALL_PROGRAM} ${DESTDIR}${ERLANG_BINDIR}/erl $(DESTDIR)${BINDIR}/erl
|
||||
|
||||
install.lib:
|
||||
( cc_root=`pwd`; PATH=$${cc_root}/erts/bin:$${PATH}; export PATH; \
|
||||
@@ -79,47 +79,47 @@ install.lib:
|
||||
for d in *-* ; do \
|
||||
( cd $$d ; \
|
||||
${MAKE} CC_ROOT=$${cc_root}/ TESTROOT=${ERLANG_LIBDIR} release);\
|
||||
- (cd $$d/doc/man;tar -cf - .)|(cd ${ERLANG_LIBDIR}/man;tar -xf -);\
|
||||
+ (cd $$d/doc/man;tar -cf - .)|(cd $(DESTDIR)${ERLANG_LIBDIR}/man;tar -xf -);\
|
||||
done )
|
||||
- (cd erts/doc/man;tar -cf - .)|(cd ${ERLANG_LIBDIR}/man;tar -xf -)
|
||||
+ (cd erts/doc/man;tar -cf - .)|(cd $(DESTDIR)${ERLANG_LIBDIR}/man;tar -xf -)
|
||||
for f in erts/system/erl_interface/src/*.h ; do \
|
||||
- ${INSTALL_DATA} $$f ${ERLANG_LIBDIR}/usr/include ; \
|
||||
+ ${INSTALL_DATA} $$f $(DESTDIR)${ERLANG_LIBDIR}/usr/include ; \
|
||||
done
|
||||
|
||||
# Erlang base public files
|
||||
@@ -532,12 +531,12 @@ install.Install:
|
||||
install.bin:
|
||||
- ${INSTALL_PROGRAM} ${ERLANG_ERTSBINDIR}/erl ${ERLANG_BINDIR}/erl
|
||||
- ln -s ../${ERTS}/bin/epmd ${ERLANG_BINDIR}/epmd || true
|
||||
- ln -s ../${ERTS}/bin/erl_call ${ERLANG_BINDIR}/erl_call || true
|
||||
+ ${INSTALL_PROGRAM} ${DESTDIR}${ERLANG_ERTSBINDIR}/erl $(DESTDIR)${ERLANG_BINDIR}/erl
|
||||
+ ln -s ../${ERTS}/bin/epmd $(DESTDIR)${ERLANG_BINDIR}/epmd || true
|
||||
+ ln -s ../${ERTS}/bin/erl_call $(DESTDIR)${ERLANG_BINDIR}/erl_call || true
|
||||
for s in script boot ; do \
|
||||
- ${INSTALL_DATA} erts/bin/start_clean.$$s ${ERLANG_BINDIR}/start.$$s ;\
|
||||
+ ${INSTALL_DATA} erts/bin/start_clean.$$s $(DESTDIR)${ERLANG_BINDIR}/start.$$s ;\
|
||||
done
|
||||
for s in erts/bin/start_sasl* ; do \
|
||||
- ${INSTALL_DATA} $$s ${ERLANG_BINDIR} ; \
|
||||
+ ${INSTALL_DATA} $$s $(DESTDIR)${ERLANG_BINDIR} ; \
|
||||
done
|
||||
rm -f $(BINDIR)/erl $(BINDIR)/erlc \
|
||||
$(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
|
||||
- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl
|
||||
- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc
|
||||
- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc
|
||||
- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink
|
||||
- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear
|
||||
- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/erl $(BINDIR)/erl
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/erlc $(BINDIR)/erlc
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/ecc $(BINDIR)/ecc
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/elink $(BINDIR)/elink
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/ear $(BINDIR)/ear
|
||||
+ ${LN_S} $(ERLANG_ILIBDIR)/bin/escript $(BINDIR)/escript
|
||||
|
||||
install.ertsbin:
|
||||
for f in erts/bin/${TARGET}/* ; do \
|
||||
- ${INSTALL_PROGRAM} $$f ${ERLANG_ERTSBINDIR} ; \
|
||||
+ ${INSTALL_PROGRAM} $$f $(DESTDIR)${ERLANG_ERTSBINDIR} ; \
|
||||
done
|
||||
( cd erts/obj/${TARGET} ; \
|
||||
for l in *.a ; do \
|
||||
- ${INSTALL_DATA} $$l ${ERLANG_LIBDIR}/usr/lib ; \
|
||||
- ${RANLIB} ${ERLANG_LIBDIR}/usr/lib/$$l || true ; \
|
||||
+ ${INSTALL_DATA} $$l $(DESTDIR)${ERLANG_LIBDIR}/usr/lib ; \
|
||||
+ ${RANLIB} $(DESTDIR)${ERLANG_LIBDIR}/usr/lib/$$l || true ; \
|
||||
done )
|
||||
sed -e 's|%FINAL_ROOTDIR%|$(ERLANG_LIBDIR)|' \
|
||||
- erts/system/etc.unix/erl.dist > ${ERLANG_ERTSBINDIR}/erl
|
||||
- chmod 755 ${ERLANG_ERTSBINDIR}/erl
|
||||
+ erts/system/etc.unix/erl.dist > $(DESTDIR)${ERLANG_ERTSBINDIR}/erl
|
||||
+ chmod 755 $(DESTDIR)${ERLANG_ERTSBINDIR}/erl
|
||||
|
||||
install.dirs:
|
||||
- ${MKSUBDIRS} ${ERLANG_LIBDIR}/lib
|
||||
- ${MKSUBDIRS} ${ERLANG_LIBDIR}/bin
|
||||
- ${MKSUBDIRS} ${ERLANG_LIBDIR}/usr/include
|
||||
- ${MKSUBDIRS} ${ERLANG_LIBDIR}/usr/lib
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_LIBDIR}/lib
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_LIBDIR}/bin
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_LIBDIR}/usr/include
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_LIBDIR}/usr/lib
|
||||
for m in man man/man1 man/man3 man/man4 man/man6 ; do \
|
||||
- ${MKSUBDIRS} ${ERLANG_LIBDIR}/$$m ; \
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_LIBDIR}/$$m ; \
|
||||
done
|
||||
- ${MKSUBDIRS} ${ERLANG_BINDIR}
|
||||
- ${MKSUBDIRS} ${ERLANG_ERTSBINDIR}
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_BINDIR}
|
||||
+ ${MKSUBDIRS} $(DESTDIR)${ERLANG_ERTSBINDIR}
|
||||
|
||||
clean:
|
||||
rm -f *~ *.bak config.log config.status
|
||||
#
|
||||
# Directories needed before we can install
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_lib_compiler-1_2_1_src_Makefile,v 1.1 2001/10/14 17:24:13 espie Exp $
|
||||
--- erts-47.4.0/lib/compiler-1.2.1/src/Makefile.orig Tue Dec 8 17:13:30 1998
|
||||
+++ erts-47.4.0/lib/compiler-1.2.1/src/Makefile Sun Oct 14 18:35:16 2001
|
||||
@@ -97,17 +97,17 @@ include $(CC_ROOT)/internal_tools/make/o
|
||||
# Note: Source for the compiler should not be released.
|
||||
|
||||
release_spec:
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DATA) $(TARGET_FILES) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
|
||||
release_src_spec: opt
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DATA) $(TARGET_FILES) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) $(ERL_FILES) $(DESTDIR)$(RELSYSDIR)/src
|
||||
sed 's/^\(release_spec:\).*/\1/' Makefile > Makefile.dist
|
||||
- $(INSTALL_DATA) Makefile.dist $(RELSYSDIR)/src/Makefile
|
||||
- $(INSTALL_DATA) $(APP_SRC) beam_opcodes.hrl $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) ../Makefile ../vsn.mk $(RELSYSDIR)
|
||||
+ $(INSTALL_DATA) Makefile.dist $(DESTDIR)$(RELSYSDIR)/src/Makefile
|
||||
+ $(INSTALL_DATA) $(APP_SRC) beam_opcodes.hrl $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) ../Makefile ../vsn.mk $(DESTDIR)$(RELSYSDIR)
|
||||
|
||||
release_docs_spec:
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_lib_kernel-2_1_4_src_Makefile,v 1.1 2001/10/14 17:24:13 espie Exp $
|
||||
--- erts-47.4.0/lib/kernel-2.1.4/src/Makefile.orig Sun Oct 14 18:27:14 2001
|
||||
+++ erts-47.4.0/lib/kernel-2.1.4/src/Makefile Sun Oct 14 18:27:31 2001
|
||||
@@ -97,17 +97,17 @@ $(APP_TARGET): $(APP_SRC)
|
||||
include $(CC_ROOT)/internal_tools/make/otp_release_targets.mk
|
||||
|
||||
release_spec: opt
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/include
|
||||
- $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) $(ERL_FILES) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/include
|
||||
+ $(INSTALL_DATA) $(HRL_FILES) $(DESTDIR)$(RELSYSDIR)/include
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DATA) $(TARGET_FILES) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
|
||||
release_src_spec: release_spec
|
||||
- $(INSTALL_DATA) Makefile $(APP_SRC) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) ../Makefile ../vsn.mk $(RELSYSDIR)
|
||||
+ $(INSTALL_DATA) Makefile $(APP_SRC) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) ../Makefile ../vsn.mk $(DESTDIR)$(RELSYSDIR)
|
||||
|
||||
release_docs_spec:
|
||||
|
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_lib_parsetools-1_0_1_src_Makefile,v 1.1 2001/10/14 17:24:13 espie Exp $
|
||||
--- erts-47.4.0/lib/parsetools-1.0.1/src/Makefile.orig Sun Oct 14 18:27:49 2001
|
||||
+++ erts-47.4.0/lib/parsetools-1.0.1/src/Makefile Sun Oct 14 18:28:03 2001
|
||||
@@ -70,16 +70,16 @@ $(APP_TARGET): $(APP_SRC)
|
||||
include $(CC_ROOT)/internal_tools/make/otp_release_targets.mk
|
||||
|
||||
release_spec: opt
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/include
|
||||
- $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) $(ERL_FILES) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DATA) $(TARGET_FILES) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/include
|
||||
+ $(INSTALL_DATA) $(HRL_FILES) $(DESTDIR)$(RELSYSDIR)/include
|
||||
|
||||
release_src_spec: release_spec
|
||||
- $(INSTALL_DATA) Makefile $(APP_SRC) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) ../Makefile ../vsn.mk $(RELSYSDIR)
|
||||
+ $(INSTALL_DATA) Makefile $(APP_SRC) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) ../Makefile ../vsn.mk $(DESTDIR)$(RELSYSDIR)
|
||||
|
||||
release_docs_spec:
|
||||
|
@ -1,31 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_lib_stdlib-1_5_2_src_Makefile,v 1.1 2001/10/14 17:24:13 espie Exp $
|
||||
--- erts-47.4.0/lib/stdlib-1.5.2/src/Makefile.orig Sun Oct 14 18:28:18 2001
|
||||
+++ erts-47.4.0/lib/stdlib-1.5.2/src/Makefile Sun Oct 14 18:28:38 2001
|
||||
@@ -87,18 +87,18 @@ $(APP_TARGET): $(APP_SRC)
|
||||
include $(CC_ROOT)/internal_tools/make/otp_release_targets.mk
|
||||
|
||||
release_spec:
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/include
|
||||
- $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
|
||||
- $(INSTALL_DIR) $(RELSYSDIR)/ebin
|
||||
- $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) $(ERL_FILES) $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/include
|
||||
+ $(INSTALL_DATA) $(HRL_FILES) $(DESTDIR)$(RELSYSDIR)/include
|
||||
+ $(INSTALL_DIR) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
+ $(INSTALL_DATA) $(TARGET_FILES) $(DESTDIR)$(RELSYSDIR)/ebin
|
||||
|
||||
release_src_spec: release_spec
|
||||
sed 's/^\(release_spec:\).*/\1/' Makefile > Makefile.dist
|
||||
- $(INSTALL_DATA) Makefile.dist $(RELSYSDIR)/src/Makefile
|
||||
- $(INSTALL_DATA) $(APP_SRC) erl_internal.src $(RELSYSDIR)/src
|
||||
- $(INSTALL_DATA) ../Makefile ../vsn.mk $(RELSYSDIR)
|
||||
+ $(INSTALL_DATA) Makefile.dist $(DESTDIR)$(RELSYSDIR)/src/Makefile
|
||||
+ $(INSTALL_DATA) $(APP_SRC) erl_internal.src $(DESTDIR)$(RELSYSDIR)/src
|
||||
+ $(INSTALL_DATA) ../Makefile ../vsn.mk $(DESTDIR)$(RELSYSDIR)
|
||||
|
||||
release_docs_spec:
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_system_emulator_runtime_jtab_h,v 1.1 2004/01/04 23:57:37 espie Exp $
|
||||
--- erts-47.4.0/system/emulator/runtime/jtab.h.orig 2004-01-05 00:47:40.000000000 +0100
|
||||
+++ erts-47.4.0/system/emulator/runtime/jtab.h 2004-01-05 00:47:57.000000000 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
#define DECL_JVALUE(T,value) __label__ JVAL__##T##__##value;
|
||||
#define JUMP(T,x) goto *JTAB__##T[x]
|
||||
#define DEFINE_LOCATION(T,value) JTAB__##T[value] = &&JVAL__##T##__##value
|
||||
-#define LOCATION(T,value) JVAL__##T##__##value##:
|
||||
+#define LOCATION(T,value) JVAL__##T##__##value:
|
||||
#define JUMP_END
|
||||
#define JTABLE_NEED_INIT(T) !JTAB__##T##__init
|
||||
#define DEFINE_JTABLE(T) JTAB__##T##__init = 1
|
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-erts-47_4_0_system_erl_interface_src_erl_nothreads_c,v 1.1 2004/01/04 23:57:37 espie Exp $
|
||||
--- erts-47.4.0/system/erl_interface/src/erl_nothreads.c.orig 2004-01-05 00:50:00.000000000 +0100
|
||||
+++ erts-47.4.0/system/erl_interface/src/erl_nothreads.c 2004-01-05 00:50:07.000000000 +0100
|
||||
@@ -44,12 +44,6 @@ int erl_init_nothreads(void *x, long y)
|
||||
|
||||
#if !defined(VXWORKS) && !defined(__WIN32__)
|
||||
|
||||
-void *erl_m_create(void) { return NULL; }
|
||||
-int erl_m_destroy(void *l) { return 0; }
|
||||
-int erl_m_lock(void *l) { return 0; }
|
||||
-int erl_m_trylock(void *l) { return 0; }
|
||||
-int erl_m_unlock(void *l) { return 0; }
|
||||
-
|
||||
#ifndef NO_PRAGMA_WEAK
|
||||
/* above symbols must be weak since
|
||||
* they are multiply defined
|
||||
@@ -62,4 +56,10 @@ int erl_m_unlock(void *l) { return 0; }
|
||||
|
||||
#endif
|
||||
|
||||
+void *erl_m_create(void) { return NULL; }
|
||||
+int erl_m_destroy(void *l) { return 0; }
|
||||
+int erl_m_lock(void *l) { return 0; }
|
||||
+int erl_m_trylock(void *l) { return 0; }
|
||||
+int erl_m_unlock(void *l) { return 0; }
|
||||
+
|
||||
#endif
|
66
lang/erlang/patches/patch-erts_etc_unix_Install_src
Normal file
66
lang/erlang/patches/patch-erts_etc_unix_Install_src
Normal file
@ -0,0 +1,66 @@
|
||||
$OpenBSD: patch-erts_etc_unix_Install_src,v 1.1 2006/03/07 19:30:36 sturm Exp $
|
||||
--- erts/etc/unix/Install.src.orig Fri Dec 2 16:07:40 2005
|
||||
+++ erts/etc/unix/Install.src Sun Mar 5 10:37:37 2006
|
||||
@@ -8,7 +8,8 @@ while [ $# -ne 0 ]; do
|
||||
case $1 in
|
||||
-minimal) start_option=minimal ;;
|
||||
-sasl) start_option=sasl ;;
|
||||
- *) ERL_ROOT=$1 ;;
|
||||
+ *) ERL_ROOT=$DESTDIR/$1;
|
||||
+ ERL_IROOT=$1 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
@@ -35,7 +36,7 @@ fi
|
||||
if [ -d $ERL_ROOT/erts-%I_VSN%/obj ]
|
||||
then
|
||||
cd $ERL_ROOT/erts-%I_VSN%/obj
|
||||
- sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" Makefile.src > Makefile
|
||||
+ sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" Makefile.src > Makefile
|
||||
fi
|
||||
|
||||
if [ ! -d $ERL_ROOT/bin ]
|
||||
@@ -59,14 +60,14 @@ esac
|
||||
|
||||
cd $ERL_ROOT/erts-%I_VSN%/bin
|
||||
|
||||
-sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" erl.src > erl
|
||||
+sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" erl.src > erl
|
||||
chmod 755 erl
|
||||
|
||||
#
|
||||
# Create start file for embedded system use,
|
||||
#
|
||||
(cd $ERL_ROOT/erts-%I_VSN%/bin;
|
||||
- sed -e "s;%FINAL_ROOTDIR%;$ERL_ROOT;" start.src > start;
|
||||
+ sed -e "s;%FINAL_ROOTDIR%;$ERL_IROOT;" start.src > start;
|
||||
chmod 755 start)
|
||||
|
||||
cd $ERL_ROOT/bin
|
||||
@@ -84,7 +85,7 @@ if [ -h epmd ]; then
|
||||
/bin/rm -f epmd
|
||||
fi
|
||||
|
||||
-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd
|
||||
+ln -s ../erts-%I_VSN%/bin/epmd epmd
|
||||
|
||||
cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl .
|
||||
cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl .
|
||||
@@ -94,7 +95,7 @@ chmod 755 start_erl
|
||||
echo ""
|
||||
|
||||
echo %I_VSN% %I_SYSTEM_VSN% > $ERL_ROOT/releases/start_erl.data
|
||||
-sed -e "s;%ERL_ROOT%;$ERL_ROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES
|
||||
+sed -e "s;%ERL_ROOT%;$ERL_IROOT;" $ERL_ROOT/releases/RELEASES.src > $ERL_ROOT/releases/RELEASES
|
||||
|
||||
if [ "$start_option" = "query" ]
|
||||
then
|
||||
@@ -142,7 +143,7 @@ fi
|
||||
if [ -d $ERL_ROOT/man ]
|
||||
then
|
||||
cd $ERL_ROOT
|
||||
- ./misc/format_man_pages $ERL_ROOT
|
||||
+ ./misc/format_man_pages $ERL_IROOT
|
||||
fi
|
||||
|
||||
|
6
lang/erlang/pkg/PFRAG.shared
Normal file
6
lang/erlang/pkg/PFRAG.shared
Normal file
@ -0,0 +1,6 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1 2006/03/07 19:30:36 sturm Exp $
|
||||
lib/erlang/lib/asn1-1.4.4.9/priv/lib/asn1_erl_drv.so
|
||||
lib/erlang/lib/crypto-1.4/priv/lib/crypto_drv.so
|
||||
lib/erlang/lib/megaco-3.2.3/priv/lib/megaco_flex_scanner_drv.so
|
||||
lib/erlang/lib/runtime_tools-1.5.1.1/priv/lib/trace_file_drv.so
|
||||
lib/erlang/lib/runtime_tools-1.5.1.1/priv/lib/trace_ip_drv.so
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user