Hi,
I don't think there's any good reason to have wildly different OUTPATH names
for each specific platform variant.
The various names also lead to unnecessary work when packaging, just to
correctly handle LD_LIBRARY_PATH.
The attached patch reduces OUTPATH to two possible values: unx and wnt. Since
it is potentially intrusive, I prefer to show it here for review instead of
committing it directly.
--
Francois Tigeot
>From d726ef2fca9430395010f0e6d34469f34583c78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= <ftig...@wolfpond.org>
Date: Sat, 26 May 2012 12:48:42 +0200
Subject: [PATCH] Unify OUTPATH values
* unx for Unix platforms, wnt for Windows ones
* this move reduces path lengths and simplifies packaging
Change-Id: I480a729c5bd25518dab09d89d52c104054d461c0
---
configure.in | 48 ++++++++++++++----------------------------------
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/configure.in b/configure.in
index 2382c83..ffa75d5 100644
--- a/configure.in
+++ b/configure.in
@@ -2994,7 +2994,7 @@ aix*)
OS=AIX
RTL_OS=AIX
RTL_ARCH=PowerPC
- OUTPATH=unxaigppc
+ OUTPATH=unx
P_SEP=:
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
@@ -3008,6 +3008,7 @@ cygwin*)
OS=WNT
RTL_OS=Windows
P_SEP=";"
+ OUTPATH=wnt
case "$host_cpu" in
i*86|x86_64)
@@ -3016,12 +3017,10 @@ cygwin*)
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib/x64"
- OUTPATH=wntmscx$COMEX
else
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=wntmsci$COMEX
fi
;;
*)
@@ -3048,20 +3047,20 @@ darwin*)
CPUNAME=ARM
RTL_ARCH=ARM_EABI
GUIBASE=cocoatouch
- OUTPATH=unxiosr
+ OUTPATH=unx
OS=IOS;
;;
powerpc*)
CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
- OUTPATH=unxmacxp
+ OUTPATH=unx
;;
i*86|x86_64)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=unxmacxi
+ OUTPATH=unx
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3076,7 +3075,7 @@ dragonfly*)
GUIBASE=unx
OS=DRAGONFLY
RTL_OS=DragonFly
- OUTPATH=unxdfly
+ OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3105,7 +3104,7 @@ freebsd*)
GUIBASE=unx
RTL_OS=FreeBSD
OS=FREEBSD
- OUTPATH=unxfbsd
+ OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3113,7 +3112,6 @@ freebsd*)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=unxfbsdi
;;
x86_64)
CPU=X
@@ -3135,20 +3133,19 @@ kfreebsd*)
GUIBASE=unx
OS=LINUX
RTL_OS=kFreeBSD
+ OUTPATH=unx
case "$host_cpu" in
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=unxkfgi6
;;
x86_64)
CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib64"
- OUTPATH=unxkfgx6
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3166,6 +3163,7 @@ linux-gnu*)
OS=LINUX
RTL_OS=Linux
P_SEP=:
+ OUTPATH=unx
case "$host_cpu" in
@@ -3173,13 +3171,11 @@ linux-gnu*)
CPU=L
CPUNAME=AXP
RTL_ARCH=ALPHA
- OUTPATH=unxlngaxp
;;
arm*)
CPU=R
CPUNAME=ARM
EPM_FLAGS="-a arm"
- OUTPATH=unxlngr
RTL_ARCH=ARM_EABI
case "$host_cpu" in
arm*-linux)
@@ -3192,92 +3188,78 @@ linux-gnu*)
CPUNAME=HPPA
RTL_ARCH=HPPA
EPM_FLAGS="-a hppa"
- OUTPATH=unxlnghppa
;;
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=unxlngi6
;;
ia64)
CPU=A
CPUNAME=IA64
RTL_ARCH=IA64
- OUTPATH=unxlnga
;;
mips)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips"
- OUTPATH=unxlngmips
;;
mips64)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips64"
- OUTPATH=unxlngmips
;;
mips64el)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mips64el"
- OUTPATH=unxlngmips
;;
mipsel)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mipsel"
- OUTPATH=unxlngmips
;;
m68k)
CPU=6
CPUNAME=M68K
RTL_ARCH=M68K
- OUTPATH=unxlngm68k
;;
powerpc)
CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
- OUTPATH=unxlngppc
;;
powerpc64)
CPU=P
CPUNAME=POWERPC64
RTL_ARCH=PowerPC_64
LIB64="lib64"
- OUTPATH=unxlngppc64
;;
sparc)
CPU=S
CPUNAME=SPARC
RTL_ARCH=SPARC
- OUTPATH=unxlngs
;;
s390)
CPU=3
CPUNAME=S390
RTL_ARCH=S390
- OUTPATH=unxlngs390
;;
s390x)
CPU=3
CPUNAME=S390x
RTL_ARCH=S390x
LIB64="lib64"
- OUTPATH=unxlngs390x
;;
x86_64)
CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib64"
- OUTPATH=unxlngx6
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3295,6 +3277,7 @@ linux-androideabi*)
OS=ANDROID
RTL_OS=Android
P_SEP=:
+ OUTPATH=unx
case "$host_cpu" in
@@ -3302,7 +3285,6 @@ linux-androideabi*)
CPU=R
CPUNAME=ARM
RTL_ARCH=ARM_EABI
- OUTPATH=unxandr
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3319,6 +3301,7 @@ mingw*)
OS=WNT
RTL_OS=Windows
P_SEP=:
+ OUTPATH=wnt
case "$host_cpu" in
i*86|x86_64)
@@ -3326,12 +3309,10 @@ mingw*)
CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_84
- OUTPATH=wntgccx$COMEX
else
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=wntgcci$COMEX
fi
;;
*)
@@ -3350,7 +3331,7 @@ mingw*)
GUIBASE=unx
OS=NETBSD
RTL_OS=NetBSD
- OUTPATH=unxnbsd
+ OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3389,7 +3370,7 @@ openbsd*)
GUIBASE=unx
OS=OPENBSD
RTL_OS=OpenBSD
- OUTPATH=unxobsd
+ OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3423,19 +3404,18 @@ solaris*)
OS=SOLARIS
RTL_OS=Solaris
P_SEP=:
+ OUTPATH=unx
case "$host_cpu" in
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
- OUTPATH=unxsogi
;;
sparc)
CPU=S
CPUNAME=SPARC
RTL_ARCH=SPARC
- OUTPATH=unxsogs
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
--
1.7.10.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
