From 8d169f4e303f01c35787bdb9914771d9ceded18f Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Fri, 28 Aug 2009 09:11:23 -0400
Subject: erlang : Add recipe for erlang-R13B01          * Move patches to a
 common directory as they are shared.          * Better solution needed for
 pythin function name in recipe.

---
 recipes/erlang/erlang-R11B.1/Makefile.in.patch     | 14 -------------
 .../erlang/erlang-R11B.1/erts-configure.in.patch   | 23 ----------------------
 .../erlang-R11B.1/erts-emulator-Makefile.in.patch  | 14 -------------
 .../erlang-R11B.1/erts-etc-unix-Install.src.patch  | 11 -----------
 .../lib-crypto-c_src-Makefile.in.patch             | 11 -----------
 .../lib-erl_interface-src-Makefile.in.patch        | 16 ---------------
 .../erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch  | 11 -----------
 recipes/erlang/erlang/Makefile.in.patch            | 14 +++++++++++++
 recipes/erlang/erlang/erts-configure.in.patch      | 23 ++++++++++++++++++++++
 .../erlang/erlang/erts-emulator-Makefile.in.patch  | 14 +++++++++++++
 .../erlang/erlang/erts-etc-unix-Install.src.patch  | 11 +++++++++++
 .../erlang/lib-crypto-c_src-Makefile.in.patch      | 11 +++++++++++
 .../erlang/lib-erl_interface-src-Makefile.in.patch | 16 +++++++++++++++
 .../erlang/erlang/lib-ssl-c_src-Makefile.in.patch  | 11 +++++++++++
 recipes/erlang/erlang_R13B01.bb                    |  9 +++++----
 15 files changed, 105 insertions(+), 104 deletions(-)
 delete mode 100644 recipes/erlang/erlang-R11B.1/Makefile.in.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/erts-configure.in.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch
 delete mode 100644 recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch
 create mode 100644 recipes/erlang/erlang/Makefile.in.patch
 create mode 100644 recipes/erlang/erlang/erts-configure.in.patch
 create mode 100644 recipes/erlang/erlang/erts-emulator-Makefile.in.patch
 create mode 100644 recipes/erlang/erlang/erts-etc-unix-Install.src.patch
 create mode 100644 recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch
 create mode 100644 recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch
 create mode 100644 recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch

(limited to 'recipes/erlang')

diff --git a/recipes/erlang/erlang-R11B.1/Makefile.in.patch b/recipes/erlang/erlang-R11B.1/Makefile.in.patch
deleted file mode 100644
index 5b74ce77cd..0000000000
--- a/recipes/erlang/erlang-R11B.1/Makefile.in.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- erlang/Makefile.in.orig	2006-05-12 07:43:44.000000000 -0700
-+++ erlang/Makefile.in	2006-05-20 13:42:29.000000000 -0700
-@@ -545,9 +545,10 @@
- # Install erlang base public files
- #
- install.bin:
-+	cd $(BINDIR); \
- 	for file in $(ERL_BASE_PUB_FILES); do \
- 		rm -f $(BINDIR)/$$file; \
--		${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \
-+		${LN_S} ../lib/erlang/bin/$$file .; \
- 	done
- 
- #
diff --git a/recipes/erlang/erlang-R11B.1/erts-configure.in.patch b/recipes/erlang/erlang-R11B.1/erts-configure.in.patch
deleted file mode 100644
index 6266c2fef7..0000000000
--- a/recipes/erlang/erlang-R11B.1/erts-configure.in.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- otp_src_R10B-6-orig/erts/configure.in	2005-06-21 09:37:14.000000000 -0700
-+++ erlang/erts/configure.in	2005-06-23 22:09:58.055415000 -0700
-@@ -1277,7 +1277,7 @@
-   exit(0);
- #endif
- }
--], poll_works=true, poll_works=false, poll_works=false)
-+], poll_works=true, poll_works=false, poll_works=true)
- case $poll_works in
- true)
- 	AC_MSG_RESULT(ok)
-@@ -1325,7 +1325,11 @@
- 	DED_CFLAGS="$ETHR_DEFS $DED_CFLAGS"
- fi
- 
-+if test "x$LD" = x; then
- DED_LD=ld
-+else
-+DED_LD=$LD
-+fi
- DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-R"
- STATIC_CFLAGS=""
- 
diff --git a/recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch b/recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch
deleted file mode 100644
index 1c98ed81e9..0000000000
--- a/recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- otp_src_R11B-1/erts/emulator/Makefile.in.orig	2006-08-29 02:46:47.000000000 -0700
-+++ otp_src_R11B-1/erts/emulator/Makefile.in	2006-08-31 21:46:25.000000000 -0700
-@@ -792,9 +792,10 @@
- 	$(CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
- 
- $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
--	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
-+	$(BUILD_CC) $(CFLAGS) $(INCLUDES) -o $@ hipe/hipe_mkliterals.c
- 
- $(OBJDIR)/hipe_mkliterals.o:	$(TTF_DIR)/hipe_x86_asm.h $(TTF_DIR)/hipe_ppc_asm.h
-+	$(BUILD_CC) $(CFLAGS) $(INCLUDES) -c hipe/hipe_mkliterals.c
- 
- $(TTF_DIR)/hipe_literals.h:	$(BINDIR)/hipe_mkliterals$(TF_MARKER)
- 	$(BINDIR)/hipe_mkliterals$(TF_MARKER) -c > $@
diff --git a/recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch b/recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch
deleted file mode 100644
index 9da1f7fe32..0000000000
--- a/recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- otp_src_R10B-9/erts/etc/unix/Install.src	2005-12-02 07:07:40.000000000 -0800
-+++ erlang/erts/etc/unix/Install.src	2005-12-24 11:44:51.000000000 -0800
-@@ -84,7 +84,7 @@
-   /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 .
diff --git a/recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch b/recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch
deleted file mode 100644
index a649c09bde..0000000000
--- a/recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- erlang/lib/crypto/c_src/Makefile.in-orig	2005-05-16 20:03:56.000000000 -0700
-+++ erlang/lib/crypto/c_src/Makefile.in	2005-05-16 20:02:19.000000000 -0700
-@@ -97,7 +97,7 @@
- ifeq ($(strip $(LD_R_FLAG)),)
- LD_R_OPT =
- else
--LD_R_OPT = $(LD_R_FLAG)$(SSL_LIBDIR)
-+LD_R_OPT = -Wl,$(LD_R_FLAG)/opt/lib
- endif
- 
- # ----------------------------------------------------
diff --git a/recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch b/recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch
deleted file mode 100644
index 285012e0bd..0000000000
--- a/recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- erlang/lib/erl_interface/src/Makefile.in.orig	2006-08-29 02:47:48.000000000 -0700
-+++ erlang/lib/erl_interface/src/Makefile.in	2006-09-06 12:58:07.000000000 -0700
-@@ -709,11 +709,11 @@
- ifdef THR_DEFS
- $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
- 	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \
--		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
-+		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS) $(LDFLAGS)
- else
- $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
- 	$(PURIFY) $(CC) $(PROG_CFLAGS) -o $@ $(ERLCALL) \
--		-L$(OBJDIR) -lei $(LIBS)
-+		-L$(OBJDIR) -lei $(LIBS) $(LDFLAGS)
- endif
- endif
- endif
diff --git a/recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch b/recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch
deleted file mode 100644
index cb91a79f2d..0000000000
--- a/recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- erlang/lib/ssl/c_src/Makefile.in.orig	2006-09-06 08:59:55.000000000 -0700
-+++ erlang/lib/ssl/c_src/Makefile.in	2006-09-06 09:00:41.000000000 -0700
-@@ -115,7 +115,7 @@
- ifeq ($(strip $(CC_R_FLAG)),)
- CC_R_OPT =
- else
--CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
-+CC_R_OPT = $(CC_R_FLAG)/opt/lib
- endif
- 
- 
diff --git a/recipes/erlang/erlang/Makefile.in.patch b/recipes/erlang/erlang/Makefile.in.patch
new file mode 100644
index 0000000000..5b74ce77cd
--- /dev/null
+++ b/recipes/erlang/erlang/Makefile.in.patch
@@ -0,0 +1,14 @@
+--- erlang/Makefile.in.orig	2006-05-12 07:43:44.000000000 -0700
++++ erlang/Makefile.in	2006-05-20 13:42:29.000000000 -0700
+@@ -545,9 +545,10 @@
+ # Install erlang base public files
+ #
+ install.bin:
++	cd $(BINDIR); \
+ 	for file in $(ERL_BASE_PUB_FILES); do \
+ 		rm -f $(BINDIR)/$$file; \
+-		${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \
++		${LN_S} ../lib/erlang/bin/$$file .; \
+ 	done
+ 
+ #
diff --git a/recipes/erlang/erlang/erts-configure.in.patch b/recipes/erlang/erlang/erts-configure.in.patch
new file mode 100644
index 0000000000..6266c2fef7
--- /dev/null
+++ b/recipes/erlang/erlang/erts-configure.in.patch
@@ -0,0 +1,23 @@
+--- otp_src_R10B-6-orig/erts/configure.in	2005-06-21 09:37:14.000000000 -0700
++++ erlang/erts/configure.in	2005-06-23 22:09:58.055415000 -0700
+@@ -1277,7 +1277,7 @@
+   exit(0);
+ #endif
+ }
+-], poll_works=true, poll_works=false, poll_works=false)
++], poll_works=true, poll_works=false, poll_works=true)
+ case $poll_works in
+ true)
+ 	AC_MSG_RESULT(ok)
+@@ -1325,7 +1325,11 @@
+ 	DED_CFLAGS="$ETHR_DEFS $DED_CFLAGS"
+ fi
+ 
++if test "x$LD" = x; then
+ DED_LD=ld
++else
++DED_LD=$LD
++fi
+ DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-R"
+ STATIC_CFLAGS=""
+ 
diff --git a/recipes/erlang/erlang/erts-emulator-Makefile.in.patch b/recipes/erlang/erlang/erts-emulator-Makefile.in.patch
new file mode 100644
index 0000000000..1c98ed81e9
--- /dev/null
+++ b/recipes/erlang/erlang/erts-emulator-Makefile.in.patch
@@ -0,0 +1,14 @@
+--- otp_src_R11B-1/erts/emulator/Makefile.in.orig	2006-08-29 02:46:47.000000000 -0700
++++ otp_src_R11B-1/erts/emulator/Makefile.in	2006-08-31 21:46:25.000000000 -0700
+@@ -792,9 +792,10 @@
+ 	$(CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
+ 
+ $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
+-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
++	$(BUILD_CC) $(CFLAGS) $(INCLUDES) -o $@ hipe/hipe_mkliterals.c
+ 
+ $(OBJDIR)/hipe_mkliterals.o:	$(TTF_DIR)/hipe_x86_asm.h $(TTF_DIR)/hipe_ppc_asm.h
++	$(BUILD_CC) $(CFLAGS) $(INCLUDES) -c hipe/hipe_mkliterals.c
+ 
+ $(TTF_DIR)/hipe_literals.h:	$(BINDIR)/hipe_mkliterals$(TF_MARKER)
+ 	$(BINDIR)/hipe_mkliterals$(TF_MARKER) -c > $@
diff --git a/recipes/erlang/erlang/erts-etc-unix-Install.src.patch b/recipes/erlang/erlang/erts-etc-unix-Install.src.patch
new file mode 100644
index 0000000000..9da1f7fe32
--- /dev/null
+++ b/recipes/erlang/erlang/erts-etc-unix-Install.src.patch
@@ -0,0 +1,11 @@
+--- otp_src_R10B-9/erts/etc/unix/Install.src	2005-12-02 07:07:40.000000000 -0800
++++ erlang/erts/etc/unix/Install.src	2005-12-24 11:44:51.000000000 -0800
+@@ -84,7 +84,7 @@
+   /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 .
diff --git a/recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch b/recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch
new file mode 100644
index 0000000000..a649c09bde
--- /dev/null
+++ b/recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch
@@ -0,0 +1,11 @@
+--- erlang/lib/crypto/c_src/Makefile.in-orig	2005-05-16 20:03:56.000000000 -0700
++++ erlang/lib/crypto/c_src/Makefile.in	2005-05-16 20:02:19.000000000 -0700
+@@ -97,7 +97,7 @@
+ ifeq ($(strip $(LD_R_FLAG)),)
+ LD_R_OPT =
+ else
+-LD_R_OPT = $(LD_R_FLAG)$(SSL_LIBDIR)
++LD_R_OPT = -Wl,$(LD_R_FLAG)/opt/lib
+ endif
+ 
+ # ----------------------------------------------------
diff --git a/recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch b/recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch
new file mode 100644
index 0000000000..285012e0bd
--- /dev/null
+++ b/recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch
@@ -0,0 +1,16 @@
+--- erlang/lib/erl_interface/src/Makefile.in.orig	2006-08-29 02:47:48.000000000 -0700
++++ erlang/lib/erl_interface/src/Makefile.in	2006-09-06 12:58:07.000000000 -0700
+@@ -709,11 +709,11 @@
+ ifdef THR_DEFS
+ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
+ 	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \
+-		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
++		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS) $(LDFLAGS)
+ else
+ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
+ 	$(PURIFY) $(CC) $(PROG_CFLAGS) -o $@ $(ERLCALL) \
+-		-L$(OBJDIR) -lei $(LIBS)
++		-L$(OBJDIR) -lei $(LIBS) $(LDFLAGS)
+ endif
+ endif
+ endif
diff --git a/recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch b/recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch
new file mode 100644
index 0000000000..cb91a79f2d
--- /dev/null
+++ b/recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch
@@ -0,0 +1,11 @@
+--- erlang/lib/ssl/c_src/Makefile.in.orig	2006-09-06 08:59:55.000000000 -0700
++++ erlang/lib/ssl/c_src/Makefile.in	2006-09-06 09:00:41.000000000 -0700
+@@ -115,7 +115,7 @@
+ ifeq ($(strip $(CC_R_FLAG)),)
+ CC_R_OPT =
+ else
+-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
++CC_R_OPT = $(CC_R_FLAG)/opt/lib
+ endif
+ 
+ 
diff --git a/recipes/erlang/erlang_R13B01.bb b/recipes/erlang/erlang_R13B01.bb
index e85a297ff9..33ecfc7564 100644
--- a/recipes/erlang/erlang_R13B01.bb
+++ b/recipes/erlang/erlang_R13B01.bb
@@ -1,14 +1,15 @@
 include erlang.inc
 DEPENDS += "erlang-native openssl"
 
-SRC_URI += "file://erts-configure.in.patch;patch=1 \
+SRC_URI += "\
             file://erts-emulator-Makefile.in.patch;patch=1 \
             file://erts-etc-unix-Install.src.patch;patch=1 \
-            file://lib-crypto-c_src-Makefile.in.patch;patch=1 \
             file://lib-erl_interface-src-Makefile.in.patch;patch=1 \
             file://Makefile.in.patch;patch=1 \
             "
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
 
 EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}"
@@ -50,7 +51,7 @@ do_install() {
     done
 }
 
-def get_erlang_libs(d):
+def get_erlang_libs_R13B01(d):
     import os, bb
     install_root = bb.data.getVar('D', d, 1)
     libdir = bb.data.getVar('libdir', d, 1)[1:]
@@ -68,5 +69,5 @@ def get_erlang_libs(d):
     return libs
 
 FILES_${PN}-dbg += " ${libdir}/erlang/bin/.debug ${libdir}/erlang/*/bin/.debug ${libdir}/erlang/lib/*/bin/.debug"
-FILES_${PN}-libs += " ${@' '.join(get_erlang_libs(d))}"
+FILES_${PN}-libs += " ${@' '.join(get_erlang_libs_R13B01(d))}"
 PACKAGES =+ "${PN}-libs"
-- 
cgit v1.2.3