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