OpenPKG Specs / changeset

     1.1 --- a/erlang/erlang.patch	Tue Jul 02 17:58:45 2013 +0200
     1.2 +++ b/erlang/erlang.patch	Tue Jul 02 18:20:50 2013 +0200
     1.3 @@ -1,15 +1,3 @@
     1.4 -Index: erts/emulator/Makefile.in
     1.5 ---- erts/emulator/Makefile.in.orig	2010-12-07 16:07:22.000000000 +0100
     1.6 -+++ erts/emulator/Makefile.in	2010-12-09 17:06:47.000000000 +0100
     1.7 -@@ -617,7 +617,7 @@
     1.8 - 
     1.9 - 
    1.10 - $(OBJDIR)/%.o: beam/%.c
    1.11 --	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
    1.12 -+	$(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
    1.13 - 
    1.14 - $(OBJDIR)/%.o: $(TARGET)/%.c
    1.15 - 	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
    1.16  Index: erts/emulator/hipe/hipe_x86.c
    1.17  --- erts/emulator/hipe/hipe_x86.c.orig	2010-12-07 16:07:22.000000000 +0100
    1.18  +++ erts/emulator/hipe/hipe_x86.c	2010-12-09 17:23:16.000000000 +0100
    1.19 @@ -39,7 +27,7 @@
    1.20  Index: lib/gs/src/tool_utils.erl
    1.21  --- lib/gs/src/tool_utils.erl.orig	2010-12-07 16:07:22.000000000 +0100
    1.22  +++ lib/gs/src/tool_utils.erl	2010-12-09 17:23:16.000000000 +0100
    1.23 -@@ -40,6 +40,9 @@
    1.24 +@@ -45,6 +45,9 @@
    1.25   	       }).
    1.26   
    1.27   
    1.28 @@ -49,7 +37,7 @@
    1.29   %%----------------------------------------------------------------------
    1.30   %% open_help(Parent, File)
    1.31   %%   Parent = gsobj()  (GS root object or parent window)
    1.32 -@@ -80,7 +83,7 @@
    1.33 +@@ -85,7 +88,7 @@
    1.34   		      {unix,Type} ->
    1.35                             case Type of
    1.36                                  darwin -> "open " ++ File;
    1.37 @@ -58,7 +46,7 @@
    1.38   			  end;
    1.39   		      {win32,_AnyType} ->
    1.40   			  "start " ++ filename:nativename(File);
    1.41 -@@ -95,7 +98,7 @@
    1.42 +@@ -100,7 +103,7 @@
    1.43   		      {unix,Type} ->
    1.44                             case Type of
    1.45                                  darwin -> "open " ++ File;
    1.46 @@ -66,8 +54,8 @@
    1.47  +                               _Else -> unix_url_command("file:" ++ File)
    1.48   			  end;
    1.49   		      {win32,_AnyType} ->
    1.50 - 			  "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/");
    1.51 -@@ -429,3 +432,53 @@
    1.52 + 			  "netscape.exe -h " ++
    1.53 +@@ -435,3 +438,53 @@
    1.54       [Last];
    1.55   insert_newlines(Other) ->
    1.56       Other.
    1.57 @@ -135,9 +123,9 @@
    1.58  Index: lib/stdlib/src/calendar.erl
    1.59  --- lib/stdlib/src/calendar.erl.orig	2010-12-07 16:07:22.000000000 +0100
    1.60  +++ lib/stdlib/src/calendar.erl	2010-12-09 17:23:16.000000000 +0100
    1.61 -@@ -216,11 +216,19 @@
    1.62 - 
    1.63 - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()].
    1.64 +@@ -279,11 +279,19 @@
    1.65 +       DateTime1 :: datetime1970(),
    1.66 +       DateTime :: datetime1970().
    1.67   local_time_to_universal_time_dst(DateTime) ->
    1.68  -    UtDst = erlang:localtime_to_universaltime(DateTime, true),
    1.69  -    Ut    = erlang:localtime_to_universaltime(DateTime, false),
    1.70 @@ -159,11 +147,10 @@
    1.71       %% Return the valid universal times
    1.72       case {LtDst,Lt} of
    1.73   	{DateTime,DateTime} when UtDst =/= Ut ->
    1.74 -Index: lib/tools/emacs/test.erl
    1.75  Index: lib/wx/configure
    1.76  --- lib/wx/configure.orig	2010-12-07 16:07:22.000000000 +0100
    1.77  +++ lib/wx/configure	2010-12-09 17:23:16.000000000 +0100
    1.78 -@@ -3910,7 +3910,7 @@
    1.79 +@@ -4065,7 +4065,7 @@
    1.80   	;;
    1.81       *)
    1.82   	DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS"
    1.83 @@ -171,4 +158,3 @@
    1.84  +	CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%"
    1.85   	;;
    1.86   esac
    1.87 - 

     2.1 --- a/erlang/erlang.spec	Tue Jul 02 17:58:45 2013 +0200
     2.2 +++ b/erlang/erlang.spec	Tue Jul 02 18:20:50 2013 +0200
     2.3 @@ -22,9 +22,9 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_opkg   R15B03.1
     2.8 -%define       V_real   R15B03-1
     2.9 -%define       V_subdir R15B03
    2.10 +%define       V_opkg   R16B01
    2.11 +%define       V_real   R16B01
    2.12 +%define       V_subdir R16B01
    2.13  
    2.14  #   package information
    2.15  Name:         erlang
    2.16 @@ -45,7 +45,7 @@
    2.17  Patch0:       erlang.patch
    2.18  
    2.19  #   build information
    2.20 -BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, m4
    2.21 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, m4
    2.22  PreReq:       OpenPKG, openpkg >= 20100101
    2.23  BuildPreReq:  openssl
    2.24  PreReq:       openssl
    2.25 @@ -66,17 +66,25 @@
    2.26  %prep
    2.27      %setup -q -n otp_src_%{V_subdir}
    2.28      %patch -p0
    2.29 +    %{l_shtool} subst \
    2.30 +        -e 's;FLAGS="-Werror=return-type  *;FLAGS=";g' \
    2.31 +        erts/configure \
    2.32 +        lib/erl_interface/configure \
    2.33 +        lib/odbc/configure \
    2.34 +        lib/megaco/configure \
    2.35 +        lib/wx/configure
    2.36  
    2.37  %build
    2.38      CC="%{l_cc}" \
    2.39      CFLAGS="%{l_cflags -O}" \
    2.40 -    CPPFLAGS="%{l_cppflags}" \
    2.41 +    CPPFLAGS="-Ipcre %{l_cppflags}" \
    2.42      LDFLAGS="%{l_ldflags}" \
    2.43      JAVAC="false" \
    2.44      ./configure \
    2.45          --prefix=%{l_prefix} \
    2.46 -        --with-ssl=%{l_prefix}
    2.47 -    %{l_make} %{l_mflags}
    2.48 +        --with-ssl=%{l_prefix} \
    2.49 +        --enable-shared-zlib
    2.50 +    %{l_make} %{l_mflags -O}
    2.51  
    2.52  %install
    2.53      %{l_make} %{l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT