pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 591711 from home:dimstar:Factory

Browse Source 
- Explicitly call autoreconf, unless without autoconf is specified.
  In this case, there is spec-file logic to touch timestampes of
  relevant files. Move this logic to build instead of prep phase.

Fixes build with automake 1.6, see current failure in Staging:B
https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:B:DVD/emacs/standard/x86_64

OBS-URL: https://build.opensuse.org/request/show/591711
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=245
This commit is contained in:
Martin Pluskal 2018-03-30 09:50:19 +00:00 committed by Git OBS Bridge
parent 59578c809a
commit 9f65ca7e0a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emacs.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 27 16:34:37 UTC 2018 - dimstar@opensuse.org
- Explicitly call autoreconf, unless without autoconf is specified.
In this case, there is spec-file logic to touch timestampes of
relevant files. Move this logic to build instead of prep phase.
-------------------------------------------------------------------
Wed Mar 14 21:08:52 UTC 2018 - crrodriguez@opensuse.org

4
emacs.spec
View File

@ -270,6 +270,7 @@ and most assembler-like syntaxes.
%patch27 -p0
%patch -p0 -b .0
%build
%if %{without autoconf}
# We don't want to run autoconf
if test configure.ac -nt aclocal.m4 -o m4/gnulib-comp.m4 -nt aclocal.m4 ; then
@ -292,9 +293,10 @@ if test -s autogen.sh ; then
mv autogen.sh autogen.sh.no
ln -sf /bin/true autogen.sh
fi
%else
autoreconf -fiv
%endif
%build
# make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)
%if %suse_version >= 1110
%ifarch ppc ppc64 ia64