# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1372782050 -7200
# Node ID 25504c2d46b19444ffe36bda178702aef40196e2
# Parent  0a61f30eebd416e3b926c5c8a71aaa5938f6ac8f
Update to new vendor version and patch according to pcre problems.

diff -r 0a61f30eebd4 -r 25504c2d46b1 erlang/erlang.patch
--- a/erlang/erlang.patch	Tue Jul 02 17:58:45 2013 +0200
+++ b/erlang/erlang.patch	Tue Jul 02 18:20:50 2013 +0200
@@ -1,15 +1,3 @@
-Index: erts/emulator/Makefile.in
---- erts/emulator/Makefile.in.orig	2010-12-07 16:07:22.000000000 +0100
-+++ erts/emulator/Makefile.in	2010-12-09 17:06:47.000000000 +0100
-@@ -617,7 +617,7 @@
- 
- 
- $(OBJDIR)/%.o: beam/%.c
--	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-+	$(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
- 
- $(OBJDIR)/%.o: $(TARGET)/%.c
- 	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
 Index: erts/emulator/hipe/hipe_x86.c
 --- erts/emulator/hipe/hipe_x86.c.orig	2010-12-07 16:07:22.000000000 +0100
 +++ erts/emulator/hipe/hipe_x86.c	2010-12-09 17:23:16.000000000 +0100
@@ -39,7 +27,7 @@
 Index: lib/gs/src/tool_utils.erl
 --- lib/gs/src/tool_utils.erl.orig	2010-12-07 16:07:22.000000000 +0100
 +++ lib/gs/src/tool_utils.erl	2010-12-09 17:23:16.000000000 +0100
-@@ -40,6 +40,9 @@
+@@ -45,6 +45,9 @@
  	       }).
  
  
@@ -49,7 +37,7 @@
  %%----------------------------------------------------------------------
  %% open_help(Parent, File)
  %%   Parent = gsobj()  (GS root object or parent window)
-@@ -80,7 +83,7 @@
+@@ -85,7 +88,7 @@
  		      {unix,Type} ->
                            case Type of
                                 darwin -> "open " ++ File;
@@ -58,7 +46,7 @@
  			  end;
  		      {win32,_AnyType} ->
  			  "start " ++ filename:nativename(File);
-@@ -95,7 +98,7 @@
+@@ -100,7 +103,7 @@
  		      {unix,Type} ->
                            case Type of
                                 darwin -> "open " ++ File;
@@ -66,8 +54,8 @@
 +                               _Else -> unix_url_command("file:" ++ File)
  			  end;
  		      {win32,_AnyType} ->
- 			  "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/");
-@@ -429,3 +432,53 @@
+ 			  "netscape.exe -h " ++
+@@ -435,3 +438,53 @@
      [Last];
  insert_newlines(Other) ->
      Other.
@@ -135,9 +123,9 @@
 Index: lib/stdlib/src/calendar.erl
 --- lib/stdlib/src/calendar.erl.orig	2010-12-07 16:07:22.000000000 +0100
 +++ lib/stdlib/src/calendar.erl	2010-12-09 17:23:16.000000000 +0100
-@@ -216,11 +216,19 @@
- 
- -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()].
+@@ -279,11 +279,19 @@
+       DateTime1 :: datetime1970(),
+       DateTime :: datetime1970().
  local_time_to_universal_time_dst(DateTime) ->
 -    UtDst = erlang:localtime_to_universaltime(DateTime, true),
 -    Ut    = erlang:localtime_to_universaltime(DateTime, false),
@@ -159,11 +147,10 @@
      %% Return the valid universal times
      case {LtDst,Lt} of
  	{DateTime,DateTime} when UtDst =/= Ut ->
-Index: lib/tools/emacs/test.erl
 Index: lib/wx/configure
 --- lib/wx/configure.orig	2010-12-07 16:07:22.000000000 +0100
 +++ lib/wx/configure	2010-12-09 17:23:16.000000000 +0100
-@@ -3910,7 +3910,7 @@
+@@ -4065,7 +4065,7 @@
  	;;
      *)
  	DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS"
@@ -171,4 +158,3 @@
 +	CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%"
  	;;
  esac
- 
diff -r 0a61f30eebd4 -r 25504c2d46b1 erlang/erlang.spec
--- a/erlang/erlang.spec	Tue Jul 02 17:58:45 2013 +0200
+++ b/erlang/erlang.spec	Tue Jul 02 18:20:50 2013 +0200
@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg   R15B03.1
-%define       V_real   R15B03-1
-%define       V_subdir R15B03
+%define       V_opkg   R16B01
+%define       V_real   R16B01
+%define       V_subdir R16B01
 
 #   package information
 Name:         erlang
@@ -45,7 +45,7 @@
 Patch0:       erlang.patch
 
 #   build information
-BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, m4
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, m4
 PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  openssl
 PreReq:       openssl
@@ -66,17 +66,25 @@
 %prep
     %setup -q -n otp_src_%{V_subdir}
     %patch -p0
+    %{l_shtool} subst \
+        -e 's;FLAGS="-Werror=return-type  *;FLAGS=";g' \
+        erts/configure \
+        lib/erl_interface/configure \
+        lib/odbc/configure \
+        lib/megaco/configure \
+        lib/wx/configure
 
 %build
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
-    CPPFLAGS="%{l_cppflags}" \
+    CPPFLAGS="-Ipcre %{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     JAVAC="false" \
     ./configure \
         --prefix=%{l_prefix} \
-        --with-ssl=%{l_prefix}
-    %{l_make} %{l_mflags}
+        --with-ssl=%{l_prefix} \
+        --enable-shared-zlib
+    %{l_make} %{l_mflags -O}
 
 %install
     %{l_make} %{l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT