From 7aa73947312f2fda1f029a7d3fb2b4bfc3ca5cd4 Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Tue, 14 Jan 2014 18:15:07 +0000 Subject: [PATCH 1/3] Erlang R16B03 Recipe --- dev-lang/erlang/erlang-16.03.recipe | 57 ++++ dev-lang/erlang/erlang-R14B.recipe | 61 ---- dev-lang/erlang/licenses/{EPL v1.1 => EPL} | 0 dev-lang/erlang/patches/erlang-R14B.patch | 287 ------------------ .../erlang/patches/erlang_R16B03_haiku.patch | 153 ++++++++++ 5 files changed, 210 insertions(+), 348 deletions(-) create mode 100644 dev-lang/erlang/erlang-16.03.recipe delete mode 100644 dev-lang/erlang/erlang-R14B.recipe rename dev-lang/erlang/licenses/{EPL v1.1 => EPL} (100%) delete mode 100644 dev-lang/erlang/patches/erlang-R14B.patch create mode 100644 dev-lang/erlang/patches/erlang_R16B03_haiku.patch diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe new file mode 100644 index 000000000..88610ddfc --- /dev/null +++ b/dev-lang/erlang/erlang-16.03.recipe @@ -0,0 +1,57 @@ +SUMMARY="Erlang/OTP" +DESCRIPTION=" +Erlang is a programming language used to +build massively scalable soft real-time systems with +requirements on high availability. Some of its uses +are in telecoms, banking, e-commerce, computer +telephony and instant messaging. Erlang's runtime +system has built-in support for concurrency, distribution and fault tolerance." +HOMEPAGE="http://www.erlang.org" +SRC_URI="http://www.erlang.org/download/otp_src_R16B03.tar.gz" +CHECKSUM_MD5="c330150913556a0fe73e57a441cb6375" +ARCHITECTURES="x86_gcc2 x86" +LICENSE="EPL" +REVISION="1" +COPYRIGHT="1997-2013 Ericsson AB" +SOURCE_DIR="otp_src_R16B03" +PATCHES="erlang_R16B03_haiku.patch" + +PROVIDES=" + erl = $portVersion + cmd:erl = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:libtool + cmd:perl + cmd:gcc + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:perl + cmd:make + cmd:gcc + cmd:tar + cmd:uname + devel:libncurses + devel:libssl + devel:libcrypto + " +ERLANG_CFLAGS="-DETHR_X86_OUT_OF_ORDER -DHAVE_NET_IF_DL_H -DETHR_HAVE_ETHREAD_DEFINES -DETHR_PTHREADS -DETHR_SIZEOF_PTR=4 -DHAVE_CONFIG_H -I../i586-pc-haiku -I../../i586-pc-haiku -I../include/internal -I../../include/internal -I../../emulator/sys/unix -I../../include/i586-pc-haiku -I../../emulator/beam -I../../../erts/include/internal/i586-pc-haiku -I../../../erts/i586-pc-haiku -Imisc -I../include -Iepmd -Iconnect -I../../../erts/emulator/beam -I../../../erts/include/i586-pc-haiku -I../../../../erts/emulator/beam -I../../../../erts/include/i586-pc-haiku -I../../../../erts/i586-pc-haiku" + +BUILD() +{ + rm -rf `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network + mkdir -p `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network + touch `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network/hostname + + ./configure --prefix=`$binDir` --disable-ipv6 --disable-hipe LDFLAGS="-lnetwork" + HOME=/boot/home make CFLAGS="$ERLANG_CFLAGS" +} + +INSTALL() +{ + HOME=/boot/home make CFLAGS="$ERLANG_CFLAGS" install +} \ No newline at end of file diff --git a/dev-lang/erlang/erlang-R14B.recipe b/dev-lang/erlang/erlang-R14B.recipe deleted file mode 100644 index 0865f3e9c..000000000 --- a/dev-lang/erlang/erlang-R14B.recipe +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION="erlang" -HOMEPAGE="http://www.erlang.org" -SRC_URI="http://www.erlang.org/download/otp_src_R14B.tar.gz" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -CHECKSUM_MD5="5292a04556d17ad528d570e02357dfbb" -BUILD() -{ - cd otp_src_R14B - mkdir -p m4 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" - echo "AC_CHECK_LIBM" >> configure.in - rm -f erts/autoconf/config.guess - rm -f erts/autoconf/config.sub - rm -f erts/autoconf/install-sh - rm -f erts/autoconf/ltmain.sh - cp -v /boot/common/share/libtool/config/config.guess erts/autoconf - cp -v /boot/common/share/libtool/config/config.sub erts/autoconf - cp -v /boot/common/share/libtool/config/install-sh erts/autoconf - cp -v /boot/common/share/libtool/config/ltmain.sh erts/autoconf - cp -v /boot/common/share/libtool/config/config.guess lib/common_test/priv/auxdir - cp -v /boot/common/share/libtool/config/config.sub lib/common_test/priv/auxdir - cp -v /boot/common/share/libtool/config/install-sh lib/common_test/priv/auxdir - cp -v /boot/common/share/libtool/config/ltmain.sh lib/common_test/priv/auxdir - cp -v /boot/common/share/libtool/config/config.guess lib/erl_interface/src/auxdir - cp -v /boot/common/share/libtool/config/config.sub lib/erl_interface/src/auxdir - cp -v /boot/common/share/libtool/config/install-sh lib/erl_interface/src/auxdir - cp -v /boot/common/share/libtool/config/ltmain.sh lib/erl_interface/src/auxdir - cp -v /boot/common/share/libtool/config/config.guess lib/test_server/src - cp -v /boot/common/share/libtool/config/config.sub lib/test_server/src - cp -v /boot/common/share/libtool/config/install-sh lib/test_server/src - cp -v /boot/common/share/libtool/config/ltmain.sh lib/test_server/src - cp -v /boot/common/share/aclocal/libtool.m4 m4 - cp -v /boot/common/share/aclocal/ltoptions.m4 m4 - cp -v /boot/common/share/aclocal/ltversion.m4 m4 - cp -v /boot/common/share/aclocal/ltsugar.m4 m4 - cp -v /boot/common/share/aclocal/lt~obsolete.m4 m4 - rm -f aclocal.m4 -# libtoolize --copy --force --install # this fails?! so have to delete and copy files in instead - cd lib/test_server/src - autoconf - cd ../../.. - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-ssl=`finddir B_COMMON_DIRECTORY` \ - --disable-ipv6 \ - --disable-hipe \ - LDFLAGS="-lnetwork" - make -s -} - -INSTALL() -{ - cd otp_src_R14B - make -s install -} - -LICENSE="EPL v1.1" -COPYRIGHT="1997-2010 Ericsson AB" diff --git a/dev-lang/erlang/licenses/EPL v1.1 b/dev-lang/erlang/licenses/EPL similarity index 100% rename from dev-lang/erlang/licenses/EPL v1.1 rename to dev-lang/erlang/licenses/EPL diff --git a/dev-lang/erlang/patches/erlang-R14B.patch b/dev-lang/erlang/patches/erlang-R14B.patch deleted file mode 100644 index 6659da218..000000000 --- a/dev-lang/erlang/patches/erlang-R14B.patch +++ /dev/null @@ -1,287 +0,0 @@ -diff -urN otp_src_R14B/lib/test_server/src/configure.in otp_src_R14B-haiku/lib/test_server/src/configure.in ---- otp_src_R14B/lib/test_server/src/configure.in 2010-09-13 17:00:22.037748736 +0000 -+++ otp_src_R14B-haiku/lib/test_server/src/configure.in 2010-10-04 13:15:31.969932800 +0000 -@@ -279,6 +279,10 @@ - LIBS="$LIBS -lsocket -lnsl" - AC_CHECK_FUNC(accept, erl_checkNsl=0, [LIBS=$tk_oldLibs]) - fi -+ -+# Haiku uses -lnetwork instead of -lsocket -+AC_CHECK_LIB(network, socket, LIBS="$LIBS -lnetwork", LIBS="$LIBS") -+ - AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) - - dnl Checks for library functions. -diff -urN otp_src_R14B/erts/emulator/drivers/common/inet_drv.c otp_src_R14B-haiku/erts/emulator/drivers/common/inet_drv.c ---- otp_src_R14B/erts/emulator/drivers/common/inet_drv.c 2010-02-19 13:03:42.000000000 -0500 -+++ otp_src_R14B-haiku/erts/emulator/drivers/common/inet_drv.c 2010-10-08 15:13:14.000000000 -0400 -@@ -621,6 +621,7 @@ - #define INET_IFF_NPOINTTOPOINT 0x0800 - /* #define INET_IFF_NRUNNING 0x1000 */ - /* #define INET_IFF_NMULTICAST 0x2000 */ -+#define IFF_RUNNING 0x0001 - - /* Flags for "sctp_sndrcvinfo". Used in a bitmask -- must be powers of 2: - ** INET_REQ_SETOPTS:SCTP_OPT_DEFAULT_SEND_PARAM -diff -urN otp_src_R14B/erts/emulator/sys/unix/sys.c otp_src_R14B-haiku/erts/emulator/sys/unix/sys.c ---- otp_src_R14B/erts/emulator/sys/unix/sys.c 2010-02-19 13:03:16.000000000 -0500 -+++ otp_src_R14B-haiku/erts/emulator/sys/unix/sys.c 2010-10-08 15:13:14.000000000 -0400 -@@ -709,7 +709,7 @@ - if (nice_val > 39) { - nice_val = 39; - } -- erts_silence_warn_unused_result(nice(nice_val)); -+ erts_silence_warn_unused_result(nice_val); - } - - envsz = sizeof(env); -diff -urN otp_src_R14B/lib/appmon/SKIP otp_src_R14B-haiku/lib/appmon/SKIP ---- otp_src_R14B/lib/appmon/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/appmon/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/asn1/SKIP otp_src_R14B-haiku/lib/asn1/SKIP ---- otp_src_R14B/lib/asn1/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/asn1/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/common_test/SKIP otp_src_R14B-haiku/lib/common_test/SKIP ---- otp_src_R14B/lib/common_test/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/common_test/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosEvent/SKIP otp_src_R14B-haiku/lib/cosEvent/SKIP ---- otp_src_R14B/lib/cosEvent/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosEvent/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosEventDomain/SKIP otp_src_R14B-haiku/lib/cosEventDomain/SKIP ---- otp_src_R14B/lib/cosEventDomain/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosEventDomain/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosFileTransfer/SKIP otp_src_R14B-haiku/lib/cosFileTransfer/SKIP ---- otp_src_R14B/lib/cosFileTransfer/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosFileTransfer/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosNotification/SKIP otp_src_R14B-haiku/lib/cosNotification/SKIP ---- otp_src_R14B/lib/cosNotification/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosNotification/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosProperty/SKIP otp_src_R14B-haiku/lib/cosProperty/SKIP ---- otp_src_R14B/lib/cosProperty/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosProperty/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosTime/SKIP otp_src_R14B-haiku/lib/cosTime/SKIP ---- otp_src_R14B/lib/cosTime/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosTime/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/cosTransactions/SKIP otp_src_R14B-haiku/lib/cosTransactions/SKIP ---- otp_src_R14B/lib/cosTransactions/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/cosTransactions/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/crypto/SKIP otp_src_R14B-haiku/lib/crypto/SKIP ---- otp_src_R14B/lib/crypto/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/crypto/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/debugger/SKIP otp_src_R14B-haiku/lib/debugger/SKIP ---- otp_src_R14B/lib/debugger/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/debugger/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/dialyzer/SKIP otp_src_R14B-haiku/lib/dialyzer/SKIP ---- otp_src_R14B/lib/dialyzer/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/dialyzer/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/docbuilder/SKIP otp_src_R14B-haiku/lib/docbuilder/SKIP ---- otp_src_R14B/lib/docbuilder/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/docbuilder/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/edoc/SKIP otp_src_R14B-haiku/lib/edoc/SKIP ---- otp_src_R14B/lib/edoc/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/edoc/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/erl_docgen/SKIP otp_src_R14B-haiku/lib/erl_docgen/SKIP ---- otp_src_R14B/lib/erl_docgen/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/erl_docgen/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/erl_interface/SKIP otp_src_R14B-haiku/lib/erl_interface/SKIP ---- otp_src_R14B/lib/erl_interface/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/erl_interface/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/et/SKIP otp_src_R14B-haiku/lib/et/SKIP ---- otp_src_R14B/lib/et/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/et/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/eunit/SKIP otp_src_R14B-haiku/lib/eunit/SKIP ---- otp_src_R14B/lib/eunit/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/eunit/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/gs/SKIP otp_src_R14B-haiku/lib/gs/SKIP ---- otp_src_R14B/lib/gs/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/gs/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/hipe/SKIP otp_src_R14B-haiku/lib/hipe/SKIP ---- otp_src_R14B/lib/hipe/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/hipe/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/ic/SKIP otp_src_R14B-haiku/lib/ic/SKIP ---- otp_src_R14B/lib/ic/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/ic/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/inets/SKIP otp_src_R14B-haiku/lib/inets/SKIP ---- otp_src_R14B/lib/inets/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/inets/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/inviso/SKIP otp_src_R14B-haiku/lib/inviso/SKIP ---- otp_src_R14B/lib/inviso/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/inviso/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/jinterface/SKIP otp_src_R14B-haiku/lib/jinterface/SKIP ---- otp_src_R14B/lib/jinterface/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/jinterface/SKIP 2010-10-08 15:13:14.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/megaco/SKIP otp_src_R14B-haiku/lib/megaco/SKIP ---- otp_src_R14B/lib/megaco/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/megaco/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/mnesia/SKIP otp_src_R14B-haiku/lib/mnesia/SKIP ---- otp_src_R14B/lib/mnesia/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/mnesia/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/observer/SKIP otp_src_R14B-haiku/lib/observer/SKIP ---- otp_src_R14B/lib/observer/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/observer/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/odbc/SKIP otp_src_R14B-haiku/lib/odbc/SKIP ---- otp_src_R14B/lib/odbc/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/odbc/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/orber/SKIP otp_src_R14B-haiku/lib/orber/SKIP ---- otp_src_R14B/lib/orber/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/orber/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/os_mon/SKIP otp_src_R14B-haiku/lib/os_mon/SKIP ---- otp_src_R14B/lib/os_mon/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/os_mon/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/otp_mibs/SKIP otp_src_R14B-haiku/lib/otp_mibs/SKIP ---- otp_src_R14B/lib/otp_mibs/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/otp_mibs/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/parsetools/SKIP otp_src_R14B-haiku/lib/parsetools/SKIP ---- otp_src_R14B/lib/parsetools/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/parsetools/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/percept/SKIP otp_src_R14B-haiku/lib/percept/SKIP ---- otp_src_R14B/lib/percept/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/percept/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/pman/SKIP otp_src_R14B-haiku/lib/pman/SKIP ---- otp_src_R14B/lib/pman/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/pman/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/public_key/SKIP otp_src_R14B-haiku/lib/public_key/SKIP ---- otp_src_R14B/lib/public_key/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/public_key/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/reltool/SKIP otp_src_R14B-haiku/lib/reltool/SKIP ---- otp_src_R14B/lib/reltool/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/reltool/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/runtime_tools/SKIP otp_src_R14B-haiku/lib/runtime_tools/SKIP ---- otp_src_R14B/lib/runtime_tools/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/runtime_tools/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/sasl/SKIP otp_src_R14B-haiku/lib/sasl/SKIP ---- otp_src_R14B/lib/sasl/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/sasl/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/snmp/SKIP otp_src_R14B-haiku/lib/snmp/SKIP ---- otp_src_R14B/lib/snmp/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/snmp/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/ssh/SKIP otp_src_R14B-haiku/lib/ssh/SKIP ---- otp_src_R14B/lib/ssh/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/ssh/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/ssl/SKIP otp_src_R14B-haiku/lib/ssl/SKIP ---- otp_src_R14B/lib/ssl/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/ssl/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/syntax_tools/SKIP otp_src_R14B-haiku/lib/syntax_tools/SKIP ---- otp_src_R14B/lib/syntax_tools/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/syntax_tools/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/test_server/SKIP otp_src_R14B-haiku/lib/test_server/SKIP ---- otp_src_R14B/lib/test_server/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/test_server/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/toolbar/SKIP otp_src_R14B-haiku/lib/toolbar/SKIP ---- otp_src_R14B/lib/toolbar/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/toolbar/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/tools/SKIP otp_src_R14B-haiku/lib/tools/SKIP ---- otp_src_R14B/lib/tools/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/tools/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/tv/SKIP otp_src_R14B-haiku/lib/tv/SKIP ---- otp_src_R14B/lib/tv/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/tv/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/typer/SKIP otp_src_R14B-haiku/lib/typer/SKIP ---- otp_src_R14B/lib/typer/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/typer/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/webtool/SKIP otp_src_R14B-haiku/lib/webtool/SKIP ---- otp_src_R14B/lib/webtool/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/webtool/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation -diff -urN otp_src_R14B/lib/wx/SKIP otp_src_R14B-haiku/lib/wx/SKIP ---- otp_src_R14B/lib/wx/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R14B-haiku/lib/wx/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Minimal installation diff --git a/dev-lang/erlang/patches/erlang_R16B03_haiku.patch b/dev-lang/erlang/patches/erlang_R16B03_haiku.patch new file mode 100644 index 000000000..3aacae083 --- /dev/null +++ b/dev-lang/erlang/patches/erlang_R16B03_haiku.patch @@ -0,0 +1,153 @@ +diff --git otp_src_R16B03/erts/configure otp_src_R16B03-haiku/erts/configure +--- otp_src_R16B03/erts/configure ++++ otp_src_R16B03-haiku/erts/configure +@@ -6648,7 +6648,7 @@ if test "${ac_cv_lib_m_sin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6711,7 +6711,7 @@ if test $ac_cv_lib_m_sin = yes; then + #define HAVE_LIBM 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="$LIBS" + + fi + +@@ -17872,7 +17872,7 @@ echo "${ECHO_T}$gcc_dw_cmpxchg_asm" >&6 + if test "$gcc_dw_cmpxchg_asm" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +-#define ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT 1 ++#undef ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT ++#undef ERTS_SMP ++#undef USE_THREADS + + _ACEOF + + fi;; +diff --git otp_src_R16B03/erts/emulator/sys/unix/sys.c otp_src_R16B03-haiku/erts/emulator/sys/unix/sys.c +--- otp_src_R16B03/erts/emulator/sys/unix/sys.c ++++ otp_src_R16B03-haiku/erts/emulator/sys/unix/sys.c +@@ -767,7 +767,7 @@ prepare_crash_dump(int secs) + if (nice_val > 39) { + nice_val = 39; + } +- erts_silence_warn_unused_result(nice(nice_val)); ++ erts_silence_warn_unused_result(nice_val); + } + + UnUseTmpHeapNoproc(NUFBUF); +diff --git otp_src_R16B03/erts/epmd/src/Makefile.in otp_src_R16B03-haiku/erts/epmd/src/Makefile.in +--- otp_src_R16B03/erts/epmd/src/Makefile.in ++++ otp_src_R16B03-haiku/erts/epmd/src/Makefile.in +@@ -64,7 +64,7 @@ else + ifeq ($(findstring vxworks,$(TARGET)),vxworks) + ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ + else +-ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm ++ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ + endif + endif + +diff --git otp_src_R16B03/erts/etc/common/Makefile.in otp_src_R16B03-haiku/erts/etc/common/Makefile.in +--- otp_src_R16B03/erts/etc/common/Makefile.in ++++ otp_src_R16B03-haiku/erts/etc/common/Makefile.in +@@ -91,7 +91,7 @@ endif + ifeq ($(TARGET),win32) + ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ + else +-ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm ++ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ + endif + + ERTS_LIB = $(ERL_TOP)/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE +diff --git otp_src_R16B03/erts/etc/common/erlexec.c otp_src_R16B03-haiku/erts/etc/common/erlexec.c +--- otp_src_R16B03/erts/etc/common/erlexec.c ++++ otp_src_R16B03-haiku/erts/etc/common/erlexec.c +@@ -1989,7 +1989,7 @@ initial_argv_massage(int *argc, char ***argv) + + vix = 0; + +- av = build_args_from_env("ERL_" OTP_SYSTEM_VERSION "_FLAGS"); ++ av = build_args_from_env("ERL_HAIKU_FLAGS"); + if (av) + avv[vix++].argv = av; + +diff --git otp_src_R16B03/erts/include/internal/ethread.h otp_src_R16B03-haiku/erts/include/internal/ethread.h +--- otp_src_R16B03/erts/include/internal/ethread.h ++++ otp_src_R16B03-haiku/erts/include/internal/ethread.h +@@ -26,9 +26,7 @@ + #ifndef ETHREAD_H__ + #define ETHREAD_H__ + +-#ifndef ETHR_HAVE_ETHREAD_DEFINES +-# include "ethread_header_config.h" +-#endif ++#include "ethread_header_config.h" + + #include + #include "erl_errno.h" +diff --git otp_src_R16B03/erts/include/internal/i386/ethr_dw_atomic.h otp_src_R16B03-haiku/erts/include/internal/i386/ethr_dw_atomic.h +--- otp_src_R16B03/erts/include/internal/i386/ethr_dw_atomic.h ++++ otp_src_R16B03-haiku/erts/include/internal/i386/ethr_dw_atomic.h +@@ -25,6 +25,8 @@ + #ifndef ETHR_X86_DW_ATOMIC_H__ + #define ETHR_X86_DW_ATOMIC_H__ + ++#include "ethread_header_config.h" ++ + #ifdef ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT + + #define ETHR_HAVE_NATIVE_DW_ATOMIC +diff --git otp_src_R16B03/lib/asn1/c_src/Makefile otp_src_R16B03-haiku/lib/asn1/c_src/Makefile +--- otp_src_R16B03/lib/asn1/c_src/Makefile ++++ otp_src_R16B03-haiku/lib/asn1/c_src/Makefile +@@ -67,7 +67,7 @@ CLIB_FLAGS = + LN=cp + else + NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.so +-CLIB_FLAGS = -lc ++CLIB_FLAGS = + LN= ln -s + endif + +diff --git otp_src_R16B03/lib/erl_interface/src/connect/ei_connect.c otp_src_R16B03-haiku/lib/erl_interface/src/connect/ei_connect.c +--- otp_src_R16B03/lib/erl_interface/src/connect/ei_connect.c ++++ otp_src_R16B03-haiku/lib/erl_interface/src/connect/ei_connect.c +@@ -1149,6 +1149,8 @@ static unsigned int gen_challenge(void) + + #else /* some unix */ + ++int gethostid() { return 108; } ++ + static unsigned int gen_challenge(void) + { + struct { +diff --git otp_src_R16B03/lib/megaco/SKIP otp_src_R16B03-haiku/lib/megaco/SKIP +--- otp_src_R16B03/lib/megaco/SKIP 1969-12-31 19:00:00.000000000 -0500 ++++ otp_src_R16B03-haiku/lib/megaco/SKIP 2010-10-08 15:13:16.000000000 -0400 +@@ -0,0 +1 @@ ++Skip Megaco +diff --git otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in +--- otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in ++++ otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in +@@ -149,10 +149,10 @@ $(OBJDIR)/%.o: %.c + $(V_CC) -c -o $@ $(ALL_CFLAGS) $< + + $(LIBDIR)/trace_ip_drv.so: $(TRACE_IP_DRV_OBJS) +- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) ++ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) + + $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS) +- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) ++ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) + + $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS) + $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) + From 56bdcda5d1d108e1dbdf705891a669c6fd57a63e Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Tue, 14 Jan 2014 20:40:21 +0000 Subject: [PATCH 2/3] [erlang] fix recipe and patches --- dev-lang/erlang/erlang-16.03.recipe | 13 +++++- .../erlang/patches/erlang_R16B03_haiku.patch | 45 ++++++++----------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe index 88610ddfc..89a10d399 100644 --- a/dev-lang/erlang/erlang-16.03.recipe +++ b/dev-lang/erlang/erlang-16.03.recipe @@ -19,6 +19,14 @@ PATCHES="erlang_R16B03_haiku.patch" PROVIDES=" erl = $portVersion cmd:erl = $portVersion + cmd:ct_run = $portVersion + cmd:dialyzer = $portVersion + cmd:epmd = $portVersion + cmd:erlc = $portVersion + cmd:escript = $portVersion + cmd:run_erl = $portVersion + cmd:to_erl = $portVersion + cmd:typer = $portVersion " REQUIRES=" @@ -47,7 +55,10 @@ BUILD() mkdir -p `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network touch `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network/hostname - ./configure --prefix=`$binDir` --disable-ipv6 --disable-hipe LDFLAGS="-lnetwork" + ./configure --prefix="$binDir/.." --disable-ipv6 --disable-hipe LDFLAGS="-lnetwork" + echo "#undef ERTS_SMP" >> erts/i586-pc-haiku/config.h + echo "#undef USE_THREADS" >> erts/i586-pc-haiku/config.h + echo "Skip" > lib/megaco/SKIP HOME=/boot/home make CFLAGS="$ERLANG_CFLAGS" } diff --git a/dev-lang/erlang/patches/erlang_R16B03_haiku.patch b/dev-lang/erlang/patches/erlang_R16B03_haiku.patch index 3aacae083..9e59e87ac 100644 --- a/dev-lang/erlang/patches/erlang_R16B03_haiku.patch +++ b/dev-lang/erlang/patches/erlang_R16B03_haiku.patch @@ -6,7 +6,7 @@ diff --git otp_src_R16B03/erts/configure otp_src_R16B03-haiku/erts/configure else ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -+LIBS="$LIBS" ++LIBS=" $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15,11 +15,11 @@ diff --git otp_src_R16B03/erts/configure otp_src_R16B03-haiku/erts/configure _ACEOF - LIBS="-lm $LIBS" -+ LIBS="$LIBS" ++ LIBS=" $LIBS" fi -@@ -17872,7 +17872,7 @@ echo "${ECHO_T}$gcc_dw_cmpxchg_asm" >&6 +@@ -17872,7 +17872,9 @@ echo "${ECHO_T}$gcc_dw_cmpxchg_asm" >&6 if test "$gcc_dw_cmpxchg_asm" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -27,7 +27,6 @@ diff --git otp_src_R16B03/erts/configure otp_src_R16B03-haiku/erts/configure +#undef ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT +#undef ERTS_SMP +#undef USE_THREADS - _ACEOF fi;; @@ -117,6 +116,22 @@ diff --git otp_src_R16B03/lib/asn1/c_src/Makefile otp_src_R16B03-haiku/lib/asn1/ LN= ln -s endif +diff --git otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in +--- otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in ++++ otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in +@@ -149,10 +149,10 @@ $(OBJDIR)/%.o: %.c + $(V_CC) -c -o $@ $(ALL_CFLAGS) $< + + $(LIBDIR)/trace_ip_drv.so: $(TRACE_IP_DRV_OBJS) +- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) ++ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) + + $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS) +- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) ++ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) + + $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS) + $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) diff --git otp_src_R16B03/lib/erl_interface/src/connect/ei_connect.c otp_src_R16B03-haiku/lib/erl_interface/src/connect/ei_connect.c --- otp_src_R16B03/lib/erl_interface/src/connect/ei_connect.c +++ otp_src_R16B03-haiku/lib/erl_interface/src/connect/ei_connect.c @@ -129,25 +144,3 @@ diff --git otp_src_R16B03/lib/erl_interface/src/connect/ei_connect.c otp_src_R16 static unsigned int gen_challenge(void) { struct { -diff --git otp_src_R16B03/lib/megaco/SKIP otp_src_R16B03-haiku/lib/megaco/SKIP ---- otp_src_R16B03/lib/megaco/SKIP 1969-12-31 19:00:00.000000000 -0500 -+++ otp_src_R16B03-haiku/lib/megaco/SKIP 2010-10-08 15:13:16.000000000 -0400 -@@ -0,0 +1 @@ -+Skip Megaco -diff --git otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in ---- otp_src_R16B03/lib/runtime_tools/c_src/Makefile.in -+++ otp_src_R16B03-haiku/lib/runtime_tools/c_src/Makefile.in -@@ -149,10 +149,10 @@ $(OBJDIR)/%.o: %.c - $(V_CC) -c -o $@ $(ALL_CFLAGS) $< - - $(LIBDIR)/trace_ip_drv.so: $(TRACE_IP_DRV_OBJS) -- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) - - $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS) -- $(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS) -+ $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) - - $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS) - $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) - From 6c06b62ea2c739ed9401a1b978af592d7e90faca Mon Sep 17 00:00:00 2001 From: Maxim Sokhatsky Date: Wed, 15 Jan 2014 00:28:58 +0000 Subject: [PATCH 3/3] fix runConfigure omit-dirs and --- dev-lang/erlang/erlang-16.03.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe index 89a10d399..9678bc53e 100644 --- a/dev-lang/erlang/erlang-16.03.recipe +++ b/dev-lang/erlang/erlang-16.03.recipe @@ -54,8 +54,7 @@ BUILD() rm -rf `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network mkdir -p `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network touch `finddir B_SYSTEM_SETTINGS_DIRECTORY`/network/hostname - - ./configure --prefix="$binDir/.." --disable-ipv6 --disable-hipe LDFLAGS="-lnetwork" + runConfigure --omit-dirs "docDir dataRootDir" configure --prefix="$prefix" --disable-ipv6 --disable-hipe LDFLAGS="-lnetwork" echo "#undef ERTS_SMP" >> erts/i586-pc-haiku/config.h echo "#undef USE_THREADS" >> erts/i586-pc-haiku/config.h echo "Skip" > lib/megaco/SKIP