configure.in | 2 +-
solenv/bin/concat-deps.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 59bf2b14da0be958ded27ba7c5f180290cb53489
Author: Rene Engelhard <r...@debian.org>
Date: Mon Aug 20 10:01:47 2012 +0200
concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specifics
Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3
(cherry picked from commit 410b6f01f07f8f1a84f2118c71735cdbb5331d5f)
Signed-off-by: Michael Stahl <mst...@redhat.com>
Signed-off-by: Petr Mladek <pmla...@suse.cz>
Signed-off-by: Jan Holesovsky <ke...@suse.cz>
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 28ac2ed..aab36e4 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -39,7 +39,7 @@
#if defined(__linux) || defined(__OpenBSD__) || \
defined(__FreeBSD__) || defined(__NetBSD__) || \
- defined(__DragonFly__)
+ defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define CORE_BIG_ENDIAN 0
#define CORE_LITTLE_ENDIAN 1
commit d66b8674f0fb315fbd9e1dcebdd1b658d0612d3a
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 20 12:41:08 2012 +0200
configure: fix S390X CPUNAME:
The value was changed to S390x, presumably by accident, breaking the
build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272).
(cherry picked from commit 8c482683edf6aee17d4718150158293461b88b3b)
Change-Id: Icca90818c6363855437a273714a8317becdfd0e5
Signed-off-by: Rene Engelhard <r...@debian.org>
Signed-off-by: Petr Mladek <pmla...@suse.cz>
Signed-off-by: Jan Holesovsky <ke...@suse.cz>
diff --git a/configure.in b/configure.in
index 444cf82..95bd31c 100644
--- a/configure.in
+++ b/configure.in
@@ -3258,7 +3258,7 @@ linux-gnu*)
;;
s390x)
CPU=3
- CPUNAME=S390x
+ CPUNAME=S390X
RTL_ARCH=S390x
LIB64="lib64"
OUTPATH=unxlngs390x
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
