1.1 --- a/erlang/erlang.spec Tue Jul 02 17:58:45 2013 +0200 1.2 +++ b/erlang/erlang.spec Tue Jul 02 18:20:50 2013 +0200 1.3 @@ -22,9 +22,9 @@ 1.4 ## 1.5 1.6 # package version 1.7 -%define V_opkg R15B03.1 1.8 -%define V_real R15B03-1 1.9 -%define V_subdir R15B03 1.10 +%define V_opkg R16B01 1.11 +%define V_real R16B01 1.12 +%define V_subdir R16B01 1.13 1.14 # package information 1.15 Name: erlang 1.16 @@ -45,7 +45,7 @@ 1.17 Patch0: erlang.patch 1.18 1.19 # build information 1.20 -BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, m4 1.21 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, m4 1.22 PreReq: OpenPKG, openpkg >= 20100101 1.23 BuildPreReq: openssl 1.24 PreReq: openssl 1.25 @@ -66,17 +66,25 @@ 1.26 %prep 1.27 %setup -q -n otp_src_%{V_subdir} 1.28 %patch -p0 1.29 + %{l_shtool} subst \ 1.30 + -e 's;FLAGS="-Werror=return-type *;FLAGS=";g' \ 1.31 + erts/configure \ 1.32 + lib/erl_interface/configure \ 1.33 + lib/odbc/configure \ 1.34 + lib/megaco/configure \ 1.35 + lib/wx/configure 1.36 1.37 %build 1.38 CC="%{l_cc}" \ 1.39 CFLAGS="%{l_cflags -O}" \ 1.40 - CPPFLAGS="%{l_cppflags}" \ 1.41 + CPPFLAGS="-Ipcre %{l_cppflags}" \ 1.42 LDFLAGS="%{l_ldflags}" \ 1.43 JAVAC="false" \ 1.44 ./configure \ 1.45 --prefix=%{l_prefix} \ 1.46 - --with-ssl=%{l_prefix} 1.47 - %{l_make} %{l_mflags} 1.48 + --with-ssl=%{l_prefix} \ 1.49 + --enable-shared-zlib 1.50 + %{l_make} %{l_mflags -O} 1.51 1.52 %install 1.53 %{l_make} %{l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT