mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#42783: remove CPU variable from environment

Browse Source 
Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.

Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
This commit is contained in:
Michael Stahl
2013-11-06 18:59:45 +01:00
parent 9487456637
commit eca3dec204
10 changed files with 34 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bridges/Library_cpp_uno.mk
View File

@@ -9,13 +9,13 @@
$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
ifeq ($(OS)$(CPU),AIXP) ifeq ($(OS)-$(CPUNAME),AIX-POWERPC)
bridges_SELECTED_BRIDGE := gcc3_aix_powerpc bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
bridge_exception_objects := except bridge_exception_objects := except
bridge_cxx_objects := cpp2uno uno2cpp bridge_cxx_objects := cpp2uno uno2cpp
else ifeq ($(CPU),R) else ifeq ($(CPUNAME),ARM)
ifeq ($(OS),IOS) ifeq ($(OS),IOS)
$(eval $(call gb_Library_use_sdk_api,gcc3_uno)) $(eval $(call gb_Library_use_sdk_api,gcc3_uno))
@@ -35,25 +35,25 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
endif endif
else ifeq ($(OS)$(CPU),LINUXL) else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
bridges_SELECTED_BRIDGE := gcc3_linux_alpha bridges_SELECTED_BRIDGE := gcc3_linux_alpha
bridge_exception_objects := cpp2uno except uno2cpp bridge_exception_objects := cpp2uno except uno2cpp
else ifeq ($(OS)$(CPU),LINUXH) else ifeq ($(OS)-$(CPUNAME),LINUX-HPPA)
bridges_SELECTED_BRIDGE := gcc3_linux_hppa bridges_SELECTED_BRIDGE := gcc3_linux_hppa
bridge_asm_objects := call bridge_asm_objects := call
bridge_noopt_objects := cpp2uno except uno2cpp bridge_noopt_objects := cpp2uno except uno2cpp
else ifeq ($(OS)$(CPU),LINUXA) else ifeq ($(OS)-$(CPUNAME),LINUX-IA64)
bridges_SELECTED_BRIDGE := gcc3_linux_ia64 bridges_SELECTED_BRIDGE := gcc3_linux_ia64
bridge_asm_objects := call bridge_asm_objects := call
bridge_exception_objects := except bridge_exception_objects := except
bridge_noopt_objects := cpp2uno uno2cpp bridge_noopt_objects := cpp2uno uno2cpp
else ifeq ($(CPU),I) else ifeq ($(CPUNAME),INTEL)
ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_intel bridges_SELECTED_BRIDGE := gcc3_linux_intel
@@ -75,12 +75,12 @@ bridge_noopt_objects := uno2cpp
bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct
endif endif
else ifeq ($(OS)$(CPU),LINUX6) else ifeq ($(OS)-$(CPUNAME),LINUX-M68K)
bridges_SELECTED_BRIDGE := gcc3_linux_m68k bridges_SELECTED_BRIDGE := gcc3_linux_m68k
bridge_noopt_objects := cpp2uno except uno2cpp bridge_noopt_objects := cpp2uno except uno2cpp
else ifeq ($(CPU),M) else ifeq ($(CPUNAME),GODSON)
ifneq ($(filter ANDROID LINUX,$(OS)),) ifneq ($(filter ANDROID LINUX,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_mips bridges_SELECTED_BRIDGE := gcc3_linux_mips
@@ -88,36 +88,36 @@ bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except bridge_exception_objects := except
endif endif
else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC) else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
bridge_noopt_objects := uno2cpp bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except bridge_exception_objects := cpp2uno except
else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC64) else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC64)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64 bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
bridge_noopt_objects := cpp2uno uno2cpp bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except bridge_exception_objects := except
else ifeq ($(OS)$(CPUNAME),LINUXS390) else ifeq ($(OS)-$(CPUNAME),LINUX-S390)
bridges_SELECTED_BRIDGE := gcc3_linux_s390 bridges_SELECTED_BRIDGE := gcc3_linux_s390
bridge_exception_objects := cpp2uno except uno2cpp bridge_exception_objects := cpp2uno except uno2cpp
else ifeq ($(OS)$(CPUNAME),LINUXS390X) else ifeq ($(OS)-$(CPUNAME),LINUX-S390X)
bridges_SELECTED_BRIDGE := gcc3_linux_s390x bridges_SELECTED_BRIDGE := gcc3_linux_s390x
bridge_exception_objects := cpp2uno except uno2cpp bridge_exception_objects := cpp2uno except uno2cpp
else ifeq ($(OS)$(CPU),LINUXS) else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC)
bridges_SELECTED_BRIDGE := gcc3_linux_sparc bridges_SELECTED_BRIDGE := gcc3_linux_sparc
bridge_asm_objects := call bridge_asm_objects := call
bridge_noopt_objects := except bridge_noopt_objects := except
bridge_exception_objects := cpp2uno uno2cpp bridge_exception_objects := cpp2uno uno2cpp
else ifeq ($(CPU),X) else ifeq ($(CPUNAME),X86_64)
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_x86-64 bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
@@ -140,12 +140,12 @@ bridge_noncallexception_noopt_objects := callvirtualmethod
bridge_exception_objects := abi cpp2uno except uno2cpp bridge_exception_objects := abi cpp2uno except uno2cpp
endif endif
else ifeq ($(OS)$(CPU),SOLARISI) else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
bridges_SELECTED_BRIDGE := gcc3_solaris_intel bridges_SELECTED_BRIDGE := gcc3_solaris_intel
bridge_exception_objects := cpp2uno except uno2cpp bridge_exception_objects := cpp2uno except uno2cpp
else ifeq ($(OS)$(CPU),SOLARISS) else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
bridges_SELECTED_BRIDGE := gcc3_solaris_sparc bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
bridge_noopt_objects := cpp2uno uno2cpp bridge_noopt_objects := cpp2uno uno2cpp

2
bridges/Module_bridges.mk
View File

@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
Library_java_uno \ Library_java_uno \
$(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \ $(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \
) \ ) \
$(if $(filter R,$(CPU)),\ $(if $(filter ARM,$(CPUNAME)),\
$(if $(filter IOS,$(OS)),\ $(if $(filter IOS,$(OS)),\
CustomTarget_gcc3_ios_arm) \ CustomTarget_gcc3_ios_arm) \
$(if $(filter ANDROID LINUX,$(OS)),\ $(if $(filter ANDROID LINUX,$(OS)),\

1
config_host.mk.in
View File

@@ -68,7 +68,6 @@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export CPP_LIBRARY=@CPP_LIBRARY@ export CPP_LIBRARY=@CPP_LIBRARY@
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPU=@CPU@
export CPUNAME=@CPUNAME@ export CPUNAME=@CPUNAME@
export CROSS_COMPILING=@CROSS_COMPILING@ export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@ export CURL=@CURL@

48
configure.ac
View File

@@ -3839,7 +3839,7 @@ AC_SUBST(x_OBJCXXFLAGS)
AC_SUBST(x_LDFLAGS) AC_SUBST(x_LDFLAGS)
# #
# determine CPU, CPUNAME, GUIBASE, ... # determine CPUNAME, GUIBASE, ...
# #
LIB64="lib" LIB64="lib"
SOLARINC= SOLARINC=
@@ -3848,7 +3848,6 @@ case "$host_os" in
aix*) aix*)
COM=GCC COM=GCC
CPU=P
CPUNAME=POWERPC CPUNAME=POWERPC
GUIBASE=unx GUIBASE=unx
OS=AIX OS=AIX
@@ -3869,14 +3868,12 @@ cygwin*)
case "$host_cpu" in case "$host_cpu" in
i*86|x86_64) i*86|x86_64)
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
LIB64="lib/x64" LIB64="lib/x64"
PLATFORMID=windows_x86_64 PLATFORMID=windows_x86_64
OUTPATH=wntmscx$COMEX OUTPATH=wntmscx$COMEX
else else
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=windows_x86 PLATFORMID=windows_x86
@@ -3899,7 +3896,6 @@ darwin*)
case "$host_cpu" in case "$host_cpu" in
arm*) arm*)
CPU=R
CPUNAME=ARM CPUNAME=ARM
RTL_ARCH=ARM_EABI RTL_ARCH=ARM_EABI
PLATFORMID=ios_arm PLATFORMID=ios_arm
@@ -3911,7 +3907,6 @@ darwin*)
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS]) AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
fi fi
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=macosx_x86 PLATFORMID=macosx_x86
@@ -3919,13 +3914,11 @@ darwin*)
;; ;;
x86_64) x86_64)
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
PLATFORMID=macosx_x86_64 PLATFORMID=macosx_x86_64
OUTPATH=unxmacxx OUTPATH=unxmacxx
else else
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=macosx_x86 PLATFORMID=macosx_x86
@@ -3948,13 +3941,11 @@ dragonfly*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=dragonfly_x86 PLATFORMID=dragonfly_x86
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
PLATFORMID=dragonfly_x86_64 PLATFORMID=dragonfly_x86_64
@@ -3975,14 +3966,12 @@ freebsd*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=freebsd_x86 PLATFORMID=freebsd_x86
OUTPATH=unxfbsdi OUTPATH=unxfbsdi
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
PLATFORMID=freebsd_x86_64 PLATFORMID=freebsd_x86_64
@@ -4003,14 +3992,12 @@ kfreebsd*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=kfreebsd_x86 PLATFORMID=kfreebsd_x86
OUTPATH=unxkfgi6 OUTPATH=unxkfgi6
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
LIB64="lib64" LIB64="lib64"
@@ -4033,14 +4020,12 @@ linux-gnu*)
case "$host_cpu" in case "$host_cpu" in
alpha) alpha)
CPU=L
CPUNAME=AXP CPUNAME=AXP
RTL_ARCH=ALPHA RTL_ARCH=ALPHA
PLATFORMID=linux_alpha PLATFORMID=linux_alpha
OUTPATH=unxlngaxp OUTPATH=unxlngaxp
;; ;;
arm*) arm*)
CPU=R
CPUNAME=ARM CPUNAME=ARM
EPM_FLAGS="-a arm" EPM_FLAGS="-a arm"
OUTPATH=unxlngr OUTPATH=unxlngr
@@ -4054,7 +4039,6 @@ linux-gnu*)
esac esac
;; ;;
hppa) hppa)
CPU=H
CPUNAME=HPPA CPUNAME=HPPA
RTL_ARCH=HPPA RTL_ARCH=HPPA
EPM_FLAGS="-a hppa" EPM_FLAGS="-a hppa"
@@ -4062,21 +4046,18 @@ linux-gnu*)
OUTPATH=unxlnghppa OUTPATH=unxlnghppa
;; ;;
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=linux_x86 PLATFORMID=linux_x86
OUTPATH=unxlngi6 OUTPATH=unxlngi6
;; ;;
ia64) ia64)
CPU=A
CPUNAME=IA64 CPUNAME=IA64
RTL_ARCH=IA64 RTL_ARCH=IA64
PLATFORMID=linux_ia64 PLATFORMID=linux_ia64
OUTPATH=unxlnga OUTPATH=unxlnga
;; ;;
mips) mips)
CPU=M
CPUNAME=GODSON CPUNAME=GODSON
RTL_ARCH=MIPS_EB RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips" EPM_FLAGS="-a mips"
@@ -4084,7 +4065,6 @@ linux-gnu*)
OUTPATH=unxlngmips OUTPATH=unxlngmips
;; ;;
mips64) mips64)
CPU=M
CPUNAME=GODSON CPUNAME=GODSON
RTL_ARCH=MIPS_EB RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips64" EPM_FLAGS="-a mips64"
@@ -4092,7 +4072,6 @@ linux-gnu*)
OUTPATH=unxlngmips OUTPATH=unxlngmips
;; ;;
mips64el) mips64el)
CPU=M
CPUNAME=GODSON CPUNAME=GODSON
RTL_ARCH=MIPS_EL RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mips64el" EPM_FLAGS="-a mips64el"
@@ -4100,7 +4079,6 @@ linux-gnu*)
OUTPATH=unxlngmips OUTPATH=unxlngmips
;; ;;
mipsel) mipsel)
CPU=M
CPUNAME=GODSON CPUNAME=GODSON
RTL_ARCH=MIPS_EL RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mipsel" EPM_FLAGS="-a mipsel"
@@ -4108,21 +4086,18 @@ linux-gnu*)
OUTPATH=unxlngmips OUTPATH=unxlngmips
;; ;;
m68k) m68k)
CPU=6
CPUNAME=M68K CPUNAME=M68K
RTL_ARCH=M68K RTL_ARCH=M68K
PLATFORMID=linux_m68k PLATFORMID=linux_m68k
OUTPATH=unxlngm68k OUTPATH=unxlngm68k
;; ;;
powerpc) powerpc)
CPU=P
CPUNAME=POWERPC CPUNAME=POWERPC
RTL_ARCH=PowerPC RTL_ARCH=PowerPC
PLATFORMID=linux_powerpc PLATFORMID=linux_powerpc
OUTPATH=unxlngppc OUTPATH=unxlngppc
;; ;;
powerpc64) powerpc64)
CPU=P
CPUNAME=POWERPC64 CPUNAME=POWERPC64
RTL_ARCH=PowerPC_64 RTL_ARCH=PowerPC_64
LIB64="lib64" LIB64="lib64"
@@ -4130,21 +4105,18 @@ linux-gnu*)
OUTPATH=unxlngppc64 OUTPATH=unxlngppc64
;; ;;
sparc) sparc)
CPU=S
CPUNAME=SPARC CPUNAME=SPARC
RTL_ARCH=SPARC RTL_ARCH=SPARC
PLATFORMID=linux_sparc PLATFORMID=linux_sparc
OUTPATH=unxlngs OUTPATH=unxlngs
;; ;;
s390) s390)
CPU=3
CPUNAME=S390 CPUNAME=S390
RTL_ARCH=S390 RTL_ARCH=S390
PLATFORMID=linux_s390 PLATFORMID=linux_s390
OUTPATH=unxlngs390 OUTPATH=unxlngs390
;; ;;
s390x) s390x)
CPU=3
CPUNAME=S390X CPUNAME=S390X
RTL_ARCH=S390x RTL_ARCH=S390x
LIB64="lib64" LIB64="lib64"
@@ -4152,7 +4124,6 @@ linux-gnu*)
OUTPATH=unxlngs390x OUTPATH=unxlngs390x
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
LIB64="lib64" LIB64="lib64"
@@ -4175,21 +4146,18 @@ linux-android*)
case "$host_cpu" in case "$host_cpu" in
arm|armel) arm|armel)
CPU=R
CPUNAME=ARM CPUNAME=ARM
RTL_ARCH=ARM_EABI RTL_ARCH=ARM_EABI
PLATFORMID=android_arm_eabi PLATFORMID=android_arm_eabi
OUTPATH=unxandr OUTPATH=unxandr
;; ;;
mips|mipsel) mips|mipsel)
CPU=M
CPUNAME=GODSON # Weird, but maybe that's the LO convention? CPUNAME=GODSON # Weird, but maybe that's the LO convention?
RTL_ARCH=MIPS_EL RTL_ARCH=MIPS_EL
PLATFORMID=android_mips_el PLATFORMID=android_mips_el
OUTPATH=unxandm OUTPATH=unxandm
;; ;;
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=android_x86 PLATFORMID=android_x86
@@ -4211,14 +4179,12 @@ mingw*)
case "$host_cpu" in case "$host_cpu" in
i*86|x86_64) i*86|x86_64)
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_84 RTL_ARCH=X86_84
PLATFORMID=windows_x86_64 PLATFORMID=windows_x86_64
OUTPATH=wntgccx$COMEX OUTPATH=wntgccx$COMEX
SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgccx" SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgccx"
else else
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=windows_x86 PLATFORMID=windows_x86
@@ -4244,25 +4210,21 @@ mingw*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=netbsd_x86 PLATFORMID=netbsd_x86
;; ;;
powerpc) powerpc)
CPU=P
CPUNAME=POWERPC CPUNAME=POWERPC
RTL_ARCH=PowerPC RTL_ARCH=PowerPC
PLATFORMID=netbsd_powerpc PLATFORMID=netbsd_powerpc
;; ;;
sparc) sparc)
CPU=S
CPUNAME=SPARC CPUNAME=SPARC
RTL_ARCH=SPARC RTL_ARCH=SPARC
PLATFORMID=netbsd_sparc PLATFORMID=netbsd_sparc
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
PLATFORMID=netbsd_x86_64 PLATFORMID=netbsd_x86_64
@@ -4283,13 +4245,11 @@ openbsd*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=openbsd_x86 PLATFORMID=openbsd_x86
;; ;;
x86_64) x86_64)
CPU=X
CPUNAME=X86_64 CPUNAME=X86_64
RTL_ARCH=X86_64 RTL_ARCH=X86_64
PLATFORMID=openbsd_x86_64 PLATFORMID=openbsd_x86_64
@@ -4313,21 +4273,18 @@ solaris*)
case "$host_cpu" in case "$host_cpu" in
i*86) i*86)
CPU=I
CPUNAME=INTEL CPUNAME=INTEL
RTL_ARCH=x86 RTL_ARCH=x86
PLATFORMID=solaris_x86 PLATFORMID=solaris_x86
OUTPATH=unxsogi OUTPATH=unxsogi
;; ;;
sparc) sparc)
CPU=S
CPUNAME=SPARC CPUNAME=SPARC
RTL_ARCH=SPARC RTL_ARCH=SPARC
PLATFORMID=solaris_sparc PLATFORMID=solaris_sparc
OUTPATH=unxsogs OUTPATH=unxsogs
;; ;;
sparc64) sparc64)
CPU=U
CPUNAME=SPARC64 CPUNAME=SPARC64
RTL_ARCH=SPARC64 RTL_ARCH=SPARC64
PLATFORMID=solaris_sparc64 PLATFORMID=solaris_sparc64
@@ -4360,7 +4317,6 @@ INSTDIR="${BUILDDIR}/instdir/${INPATH}"
INSTROOT="${INSTDIR}${INSTROOTSUFFIX}" INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC" SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
AC_SUBST(COM) AC_SUBST(COM)
AC_SUBST(CPU)
AC_SUBST(CPUNAME) AC_SUBST(CPUNAME)
AC_SUBST(RTL_OS) AC_SUBST(RTL_OS)
AC_SUBST(RTL_ARCH) AC_SUBST(RTL_ARCH)
@@ -4445,7 +4401,7 @@ if test "$cross_compiling" = "yes"; then
cp configure CONF-FOR-BUILD cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
( (
unset COM GUIBASE OS CPU CPUNAME unset COM GUIBASE OS CPUNAME
unset CC CXX SYSBASE CFLAGS unset CC CXX SYSBASE CFLAGS
unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
unset CPPUNIT_CFLAGS CPPUNIT_LIBS unset CPPUNIT_CFLAGS CPPUNIT_LIBS

6
download.lst
View File

@@ -103,6 +103,6 @@ export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2 export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
export MOZ_ZIP_INC := $(OS)$(COM)$(CPU)inc.zip export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
export MOZ_ZIP_LIB := $(OS)$(COM)$(CPU)lib.zip export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(CPU)runtime.zip export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)runtime.zip

2
external/mingw-externals/CustomTarget_jawt.mk vendored
View File

@@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
libjawt.dll.a \ libjawt.dll.a \
)) ))
ifeq ($(OS)$(CPU),WNTX) ifeq ($(OS)-$(CPUNAME),WNT-X86_64)
$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo EXPORTS > $@ echo EXPORTS > $@

6
external/nss/ExternalProject_nss.mk vendored
View File

@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \ $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
,,nss_configure.log) ,,nss_configure.log)
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X,$(CPU)),USE_64=1) \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \ LIB="$(ILIB)" \
XCFLAGS="$(SOLARINC)" \ XCFLAGS="$(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
@@ -58,7 +58,7 @@ endif
else # OS!=WNT else # OS!=WNT
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \ NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \

14
external/openssl/ExternalProject_openssl.mk vendored
View File

@@ -19,10 +19,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\
OPENSSL_PLATFORM := \ OPENSSL_PLATFORM := \
$(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
$(if $(filter I,$(CPU)),\ $(if $(filter INTEL,$(CPUNAME)),\
$(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\ $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\
,\ ,\
$(if $(filter X,$(CPU)),\ $(if $(filter X86_64,$(CPUNAME)),\
$(if $(filter GNU/kFreeBSD,$(shell uname)),\ $(if $(filter GNU/kFreeBSD,$(shell uname)),\
debian-kfreebsd-amd64\ debian-kfreebsd-amd64\
,\ ,\
@@ -34,10 +34,8 @@ OPENSSL_PLATFORM := \
)\ )\
,\ ,\
$(if $(filter SOLARIS,$(OS)),\ $(if $(filter SOLARIS,$(OS)),\
$(if $(filter INTEL,$(CPUNAME)),\ $(if $(filter INTEL,$(CPUNAME)),solaris-x86-cc,\
$(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\ $(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\
,\
solaris-sparcv9-cc\
)\ )\
,\ ,\
$(if $(filter IOS,$(OS)),\ $(if $(filter IOS,$(OS)),\
@@ -47,11 +45,11 @@ OPENSSL_PLATFORM := \
$(if $(filter GCC,$(COM)),\ $(if $(filter GCC,$(COM)),\
mingw\ mingw\
,\ ,\
$(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\ $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
)\ )\
,\ ,\
$(if $(filter MACOSX,$(OS)),\ $(if $(filter MACOSX,$(OS)),\
$(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\ $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc,darwin64-x86_64-cc)\
)\ )\
)\ )\
)\ )\

41
external/postgresql/postgresql-9.2.1-libreoffice.patch vendored
View File

@@ -9,28 +9,7 @@
+ @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@' + @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
--- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100 --- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100
+++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100 +++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100
@@ -11,30 +11,29 @@ @@ -11,14 +11,12 @@
# CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
-!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
-CPU=i386
+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
+MACHINE=i386
!MESSAGE Building the Win32 static library...
!MESSAGE
-!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
+!ELSEIF ("$(CPU)" == "X")
+MACHINE=AMD64
ADD_DEFINES=/D "WIN64" /Wp64 /GS
ADD_SECLIB=bufferoverflowU.lib
!MESSAGE Building the Win64 static library...
!MESSAGE
!ELSE
!MESSAGE Please check a CPU=$(CPU) ?
-!MESSAGE CPU=i386 or AMD64 or IA64
+!MESSAGE CPU=I or X
!ERROR Make aborted.
!ENDIF !ENDIF
!IFDEF DEBUG !IFDEF DEBUG
@@ -47,15 +26,6 @@
OUTFILENAME=libpq OUTFILENAME=libpq
!ENDIF !ENDIF
@@ -54,7 +53,7 @@
!ENDIF
!IF "$(KFW_LIB_PATH)" == ""
-KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
+KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
!MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
!ENDIF
@@ -67,18 +66,11 @@ @@ -67,18 +66,11 @@
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
@@ -92,15 +62,6 @@
/D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES) /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
!IFDEF USE_SSL !IFDEF USE_SSL
@@ -205,7 +198,7 @@
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
/nologo /subsystem:windows /dll $(LOPT) /incremental:no \
- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
/out:"$(OUTDIR)\$(OUTFILENAME).dll"\
/implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" \
/libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" \
@@ -222,7 +215,7 @@ @@ -222,7 +215,7 @@
<< <<

2
sal/Library_sal.mk
View File

@@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/backtrace \ sal/osl/unx/backtrace \
)) ))
endif endif
ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),) ifneq ($(filter $(CPUNAME),SPARC64 SPARC),)
$(eval $(call gb_Library_add_asmobjects,sal,\ $(eval $(call gb_Library_add_asmobjects,sal,\
sal/osl/unx/asm/interlck_sparc \ sal/osl/unx/asm/interlck_sparc \
)) ))