From: Jakub Bogusz Date: Mon, 9 Sep 2019 19:09:23 +0000 (+0200) Subject: - added no-fop patch (disable pdf docs, avoid build failure when fop 1.0 is installed) X-Git-Tag: auto/th/erlang-21.3.8.7-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ferlang.git;a=commitdiff_plain;h=6f79b258a358ac93584a7a852a9c6df43c07bec9 - added no-fop patch (disable pdf docs, avoid build failure when fop 1.0 is installed) --- diff --git a/erlang-no-fop.patch b/erlang-no-fop.patch new file mode 100644 index 0000000..960d69a --- /dev/null +++ b/erlang-no-fop.patch @@ -0,0 +1,12 @@ +--- otp-OTP-21.3.8.6/erts/configure.in.orig 2019-07-11 17:18:55.000000000 +0200 ++++ otp-OTP-21.3.8.6/erts/configure.in 2019-09-09 17:44:05.368217526 +0200 +@@ -855,7 +855,8 @@ + AC_MSG_WARN([No 'xsltproc' command found: the documentation cannot be built]) + fi + +-AC_CHECK_PROGS(FOP, fop) ++dnl AC_CHECK_PROGS(FOP, fop) ++AC_SUBST(FOP) + if test -z "$FOP"; then + FOP="$ERL_TOP/make/fakefop" + echo "fop" >> doc/CONF_INFO diff --git a/erlang.spec b/erlang.spec index e615dfa..399e86a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -28,6 +28,8 @@ Source4: epmd@.service Source5: epmd@.socket Patch0: %{name}-fPIC.patch Patch1: x32.patch +# disable pdf docs (require libxslt-progs and fop > 1.0, with -cache option) +Patch2: %{name}-no-fop.patch URL: http://www.erlang.org/ %{?with_java:BuildRequires: /usr/bin/jar} BuildRequires: autoconf @@ -64,6 +66,7 @@ rozpowszechnianiu Erlanga poza Ericssonem. %setup -q -n otp-OTP-%{_version} #%patch0 -p1 %patch1 -p1 +%patch2 -p1 %build ./otp_build autoconf