haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

[erlang] fix recipe and patches

Browse Source
This commit is contained in:
Maxim Sokhatsky
2014-01-14 20:40:21 +00:00
parent 5187c6c9ba
commit 56bdcda5d1
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dev-lang/erlang/erlang-16.03.recipe
View File

@@ -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"
}

45
dev-lang/erlang/patches/erlang_R16B03_haiku.patch
View File

@@ -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)