[Libreoffice-commits] .: 2 commits - avmedia/Module_avmedia.mk config_host.mk.in configure.in postprocess/packcomponents scp2/InstallModule_ooo.mk scp2/source solenv/gbuild solenv/inc vcl/Library_vcl.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 28 22:18:05 PDT 2012
avmedia/Module_avmedia.mk | 2 +-
config_host.mk.in | 1 -
configure.in | 2 --
postprocess/packcomponents/makefile.mk | 2 +-
scp2/InstallModule_ooo.mk | 3 ---
scp2/source/ooo/file_library_ooo.scp | 2 +-
solenv/gbuild/platform/macosx.mk | 8 ++++++++
solenv/inc/wntmsc.mk | 12 ++++++------
vcl/Library_vcl.mk | 2 +-
9 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 4671e25d99bb2ad0f4f8f68c25fcc1bfce9e79b8
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Sep 28 13:21:59 2012 +0300
No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 115ee13..f712344 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
endif
ifeq ($(GUIBASE),aqua)
-ifneq ($(BITNESS_OVERRIDE),64)
+ifneq ($(CPUNAME),X86_64)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
))
diff --git a/config_host.mk.in b/config_host.mk.in
index 2310098..7a511ea 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -56,7 +56,6 @@ export CDR_LIBS=@CDR_LIBS@
export CDR_TARBALL=@CDR_TARBALL@
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLASSPATH=@CLASSPATH@
-export BITNESS_OVERRIDE=@BITNESS_OVERRIDE@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@
diff --git a/configure.in b/configure.in
index be63978..aca0eaf 100644
--- a/configure.in
+++ b/configure.in
@@ -2865,8 +2865,6 @@ AC_SUBST(ENABLE_DIRECTX)
AC_SUBST(DISABLE_ACTIVEX)
AC_SUBST(DISABLE_ATL)
-AC_SUBST(BITNESS_OVERRIDE)
-
if test "$cross_compiling" = "yes"; then
CROSS_COMPILING=YES
SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 998a13f..8b2aea2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -328,7 +328,7 @@ my_components += \
.END
.IF "$(GUIBASE)" == "aqua"
-.IF "$(BITNESS_OVERRIDE)" != "64"
+.IF "$(CPUNAME)" != "X86_64"
my_components += \
component/avmedia/source/quicktime/avmediaQuickTime
.ENDIF
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 459cbf6..5ca6b6c 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -166,9 +166,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\
-DWITHOUT_MYSPELL_DICTS \
) \
- $(if $(BITNESS_OVERRIDE),\
- -DBITNESS_OVERRIDE=$(BITNESS_OVERRIDE) \
- ) \
))
ifeq ($(DISABLE_PYTHON),TRUE)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 828c476..3cc740b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -528,7 +528,7 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
End
-#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32
+#ifndef X86_64
File gid_File_Lib_avmediaQuickTime
LIB_FILE_BODY;
Styles = (PACKED);
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 4e8b7be..ef6e589 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -29,7 +29,7 @@
JAVAFLAGSDEBUG=-g
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
ASM=ml
AFLAGS=/c /Cp /coff /safeseh
.ELSE
@@ -89,7 +89,7 @@ CFLAGS+=-GS
CFLAGS+=-c -nologo -Gs $(NOLOGO)
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
.ELSE
CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
@@ -119,7 +119,7 @@ CFLAGS+= -Z7
CFLAGSEXCEPTIONS=-EHa
CFLAGS_NO_EXCEPTIONS=
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
.ENDIF
@@ -204,7 +204,7 @@ _VC_MANIFEST_BASENAME=__VC80
_VC_MANIFEST_BASENAME=__VC90
.ENDIF
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
.ELSE
LINK=link /MACHINE:X64
@@ -217,7 +217,7 @@ LINKFLAGS=/MAP /OPT:NOREF
.ENDIF
# excetion handling protection
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
LINKFLAGS+=-safeseh
.ENDIF
@@ -301,7 +301,7 @@ LIBMGR=lib $(NOLOGO)
IMPLIB=lib
LIBFLAGS=
-.IF "$(BITNESS_OVERRIDE)" == ""
+.IF "$(CPU)" == "I"
IMPLIBFLAGS=-machine:IX86
.ELSE
IMPLIBFLAGS=-machine:X64
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6eebaeb..6aaa675 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -437,7 +437,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
AppleRemote \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
- $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \
+ $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
Cocoa \
Carbon \
CoreFoundation \
commit 0919d45d514642ed6cc62fe20227a99295a09d40
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Sep 28 13:07:19 2012 +0300
Workaround for boost problem with the 10.7 SDK
Change-Id: I970326f084ef20fc9887e62adf95547c2468aebd
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f1b6666..1aad554 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -75,6 +75,14 @@ gb_COMPILERDEFS += \
endif
+# Without this I get struct/class clashes for "complex" when compiling
+# some source files in vcl, at least with the 10.7 SDK.
+ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),)
+gb_COMPILERDEFS += \
+ -DBOOST_DETAIL_NO_CONTAINER_FWD \
+
+endif
+
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double
endif
More information about the Libreoffice-commits
mailing list