diff options
| author | Paul Menzel <pmenzel@molgen.mpg.de> | 2018-06-12 11:05:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-06-21 16:24:40 +0200 |
| commit | e3658c5d6c50216a313beeda26b0d57b81d41dd8 (patch) | |
| tree | f3ff5b97fc4b1a7bd0dd853dbc393e740b99752b /external | |
| parent | 5b2d9b0cd0ef8ea44ced8a3479fa521b74058edc (diff) | |
libatomic_ops: Use newer `config.guess` and `config.sub`
On ppc64le with Ubuntu 18.04 and latest LibreOffice from master, the
build fails with the error below.
```
$ uname -m
ppc64le
$ git describe --dirty
libreoffice-6-1-branch-point-897-gd776263a9968
$ git log --oneline -1
d776263a9968 (HEAD -> master, origin/master, origin/HEAD) uitest Calc-Statistics- Descriptive statistics
$ ./configure
[…]
$ make
[…]
checking build system type... ./config.guess: unable to guess system type
This script, last modified 2011-05-11, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run (./config.guess) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches@gnu.org> in order to provide the needed
information to handle your system.
config.guess timestamp = 2011-05-11
uname -m = ppc64le
uname -r = 4.17.0-rc6+
uname -s = Linux
uname -v = #1 SMP Sun May 27 18:16:57 CEST 2018
/usr/bin/uname -p =
/bin/uname -X =
hostinfo =
/bin/universe =
/usr/bin/arch -k =
/bin/arch =
/usr/bin/oslevel =
/usr/convex/getsysinfo =
UNAME_MACHINE = ppc64le
UNAME_RELEASE = 4.17.0-rc6+
UNAME_SYSTEM = Linux
UNAME_VERSION = #1 SMP Sun May 27 18:16:57 CEST 2018
configure: error: cannot guess build type; you must specify one
/dev/shm/libreoffice-core/external/libatomic_ops/ExternalProject_libatomic_ops.mk:19: recipe for target '/dev/shm/libreoffice-core/workdir/ExternalProject/libatomic_ops/build' failed
make[1]: *** [/dev/shm/libreoffice-core/workdir/ExternalProject/libatomic_ops/build] Error 1
make[1]: *** Waiting for unfinished jobs....
[…]
```
So, replace the library's config.sub and config.guess by the internal,
more up-to-date copies.
Change-Id: Ib92489943517a4204528f1039f6fba26363b33ee
Solution-by: David Tardon <dtardon@redhat.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Reviewed-on: https://gerrit.libreoffice.org/56054
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libatomic_ops/UnpackedTarball_libatomic_ops.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk index 602c483f3efc..652b8381a508 100644 --- a/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk +++ b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk @@ -11,4 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libatomic_ops)) $(eval $(call gb_UnpackedTarball_set_tarball,libatomic_ops,$(LIBATOMIC_OPS_TARBALL))) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libatomic_ops)) + # vim: set noet sw=4 ts=4: |