[Libreoffice-commits] .: 3 commits - boost/boost.vc2012.patch boost/makefile.mk configure.in external/msvcp110 oowintool openssl/openssl.patch
Peter Foley
pefoley2 at kemper.freedesktop.org
Thu Aug 16 15:39:33 PDT 2012
boost/boost.vc2012.patch | 14 ++++++++++++++
boost/makefile.mk | 1 +
configure.in | 18 +++++++++++++-----
external/msvcp110/README_msvcX110.dll | 2 ++
oowintool | 16 ++++++++++++++--
openssl/openssl.patch | 4 ++--
6 files changed, 46 insertions(+), 9 deletions(-)
New commits:
commit 5d25bbee44cda24b61188ab2fa1a892824b55f40
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Aug 16 15:38:00 2012 -0400
fix sal build with vs2012
Change-Id: Ia03980d5d890de7db1e606409a646a5a4f79e91e
diff --git a/boost/boost.vc2012.patch b/boost/boost.vc2012.patch
new file mode 100644
index 0000000..146ac09
--- /dev/null
+++ b/boost/boost.vc2012.patch
@@ -0,0 +1,14 @@
+--- misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp
++++ misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp
+@@ -101,6 +101,11 @@
+ # define BOOST_NO_ADL_BARRIER
+ #endif
+
++#if _MSC_VER >= 1700 // 1700 == VC++ 11.0
++ // Removed in VC11:
++# define BOOST_NO_0X_HDR_INITIALIZER_LIST
++#endif
++
+
+ #if (_MSC_VER <= 1600)
+ // MSVC (including the latest checked version) has not yet completely
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 5ce795f..6a3a7b0 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -69,6 +69,7 @@ PATCH_FILES+=boost.6397.warnings.patch
PATCH_FILES+=boost.mipsbackport.patch
PATCH_FILES+=boost.windows.patch
+PATCH_FILES+=boost.vc2012.patch
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
.IF "$(COM)" == "GCC"
commit 37b9e290d9e3d20652df0abe1a1458412f3cfe2c
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Aug 16 13:51:54 2012 -0400
fix openssl build with VS2012
Change-Id: Ic0e04ab920c50320785f2e1b847026cc4e7b1e0d
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 538b2c1..4bf7761 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -91,7 +91,7 @@
$cc='$(CC)';
- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
-+ $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
++ $base_cflags=' -W3 -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
$base_cflags.=" $wcecdefs";
- $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
- $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
@@ -102,7 +102,7 @@
else # Win32
{
- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-+ $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
++ $base_cflags=' -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
- my $f = $shlib || $fips ?' /MD':' /MT';
commit fdcd85087147e0f016f667706a27899f49e836f0
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Aug 16 13:23:56 2012 -0400
enable build with Visual Studio 2012
Change-Id: I95e5974e4f109eb8882f7260d19c439a86931e64
diff --git a/configure.in b/configure.in
index a270350..39b78a6 100644
--- a/configure.in
+++ b/configure.in
@@ -2969,13 +2969,13 @@ if test "$_os" = "WINNT"; then
AC_MSG_RESULT([$with_cl_home])
dnl ===========================================================
- dnl Check for mspdb80.dll/mspdb100.dll
+ dnl Check for mspdb80.dll/mspdb100.dll/mspdb110.dll
dnl ===========================================================
- dnl MSVS 2008/10 Compiler
+ dnl MSVS 2008/10/12 Compiler
if test -n "$with_mspdb_path";then
with_mspdb_path=`cygpath -u "$with_mspdb_path"`
fi
- if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
+ if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll" -o -e "$with_mspdb_path/mspdb110.dll"; then
MSPDB_PATH="$with_mspdb_path"
fi
dnl MSVS 2008 case
@@ -2990,16 +2990,21 @@ if test "$_os" = "WINNT"; then
if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
+ dnl MSVS 2012 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb110.dll"; then
+ MSPDB_PATH="$with_cl_home/../Common7/IDE"
+ fi
if test -z "$MSPDB_PATH";then
dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
+ AC_PATH_PROG(MSPDB_PATH, mspdb110.dll)
MSPDB_PATH=`dirname "$MSPDB_PATH"`
fi
if test -z "$MSPDB_PATH"; then
- AC_MSG_ERROR([You need a mspdb80.dllor mspdb100.dll, make sure it is in the path or use --with-mspdb-path])
+ AC_MSG_ERROR([You need a mspdb80.dll or mspdb100.dll or mspdb110.dll, make sure it is in the path or use --with-mspdb-path])
fi
MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
@@ -3047,7 +3052,10 @@ if test "$_os" = "WINNT"; then
printf (\"%04d\",vertoken[[i]] )
}
}"`
- if test "$CCNUMVER" -ge "001600000000"; then
+ if test "$CCNUMVER" -ge "001700000000"; then
+ COMEX=14
+ MSVSVER=2012
+ elif test "$CCNUMVER" -ge "001600000000"; then
COMEX=13
MSVSVER=2010
elif test "$CCNUMVER" -ge "001500000000"; then
diff --git a/external/msvcp110/README_msvcX110.dll b/external/msvcp110/README_msvcX110.dll
new file mode 100755
index 0000000..51e1769
--- /dev/null
+++ b/external/msvcp110/README_msvcX110.dll
@@ -0,0 +1,2 @@
+Put msvcp110.dll, msvcr110.dll in this directory for Windows builds using a
+VS 2012 / VC 11.0 compiler.
diff --git a/oowintool b/oowintool
index de929cb..9e40a78 100755
--- a/oowintool
+++ b/oowintool
@@ -151,10 +151,22 @@ my %msvc_2010 = (
'dll_path' => 'redist/x86/Microsoft.VC100.CRT',
'dll_suffix' => '100'
);
+my %msvs_2012 = (
+ 'ver' => '11.0',
+ 'key' => 'Microsoft/VisualStudio/11.0/Setup/VS/ProductDir',
+ 'dll_path' => 'VC/redist/x86/Microsoft.VC110.CRT',
+ 'dll_suffix' => '110'
+);
+my %msvc_2012 = (
+ 'ver' => '11.0',
+ 'key' => 'Microsoft/VisualStudio/11.0/Setup/VC/ProductDir',
+ 'dll_path' => 'redist/x86/Microsoft.VC110.CRT',
+ 'dll_suffix' => '110'
+);
sub find_msvs()
{
- my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
+ my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2012, \%msvs_2010 );
for $ver (@ms_versions) {
my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
@@ -168,7 +180,7 @@ sub find_msvs()
sub find_msvc()
{
- my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
+ my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2012, \%msvc_2010 );
for $ver (@ms_versions) {
my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
More information about the Libreoffice-commits
mailing list