[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst external/python3
configure.ac |2
download.lst |4 -
external/python3/ExternalProject_python3.mk |6 -
external/python3/UnpackedTarball_python3.mk |2
external/python3/python-3.3.5-pyexpat-symbols.patch.1 | 28
external/python3/python-3.5.7-c99.patch.1 | 62 --
6 files changed, 5 insertions(+), 99 deletions(-)
New commits:
commit 1a02ab9354ac0bfc385e655fb1748278517b1778
Author: Michael Stahl
AuthorDate: Mon Nov 18 18:45:46 2019 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 22 14:38:57 2019 +0100
python3: upgrade to release 3.5.9
Fixes CVE-2019-9948 CVE-2019-9740 CVE-2019-10160 CVE-2019-16056
and expat CVE-2019-15903.
python-3.3.5-pyexpat-symbols.patch.1 fails to apply, and it's a
mystery why --with-system-expat is used everywhere but on MacOSX,
where 292af048ace2d4b455b2da3a22c784cb05db1d09 disabled it for no
obvious reason, so try to remove the special case and get rid of the
patch.
Reviewed-on: https://gerrit.libreoffice.org/83117
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit b0930d56130fdddfe65e92b081a8afad77974076)
Reviewed-on: https://gerrit.libreoffice.org/83189
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0d4b1f624349361e5bf11b58ccc9e0e295c0e4aa)
Remove external/python3/python-3.5.7-c99.patch.1 - was apparently
reverted upstream.
Change-Id: I5ba4532eb6e7c2fb90daba95d132dcc7c9013d96
Reviewed-on: https://gerrit.libreoffice.org/83426
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index 0a912c2bf238..d6e72337e25c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8449,7 +8449,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.9
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 993b5d105bcd..1d050742084c 100644
--- a/download.lst
+++ b/download.lst
@@ -134,8 +134,8 @@ export PNG_TARBALL := libpng-1.6.37.tar.xz
export POPPLER_MD5SUM := 1ce581bde2f23fa55bee13d8c61ac0df
export POPPLER_TARBALL := poppler-0.74.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_MD5SUM := b1b4949786732494f4d6675c184aa765
-export PYTHON_TARBALL := Python-3.5.7.tar.xz
+export PYTHON_MD5SUM := ef7f82485e83c7f8f8bcb920a9c2457b
+export PYTHON_TARBALL := Python-3.5.9.tar.xz
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL :=
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index f91399c0af52..de3c9faed444 100755
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -43,9 +43,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
else
-# this was added in 2004, hopefully is obsolete now (and why only intel
anyway)? $(if $(filter SOLARIS-INTEL,$(OS)$(CPUNAME)),--disable-ipv6)
-
-# --with-system-expat: this should find the one in the solver (or system)
+# --with-system-expat: this should find the one in the workdir (or system)
# create a symlink "LO_lib" because the .so are in a directory with platform
# specific name like build/lib.linux-x86_64-3.3
@@ -61,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(ENABLE_VALGRIND),--with-valgrind) \
--prefix=/python-inst \
- $(if $(filter MACOSX,$(OS)),,--with-system-expat) \
+ --with-system-expat \
$(if $(filter AIX,$(OS)), \
--disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3
-Wall", \
$(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 5fe0212d86e3..048716423c13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -24,11 +24,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
- external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac
configure.ac | 137 +++ 1 file changed, 73 insertions(+), 64 deletions(-) New commits: commit 733f31f068348f9fdc70259b9585506e26b32f9f Author: Stephan Bergmann AuthorDate: Tue Feb 14 15:56:00 2017 +0100 Commit: Thorsten Behrens CommitDate: Wed Mar 13 15:31:54 2019 +0100 Keep original CFLAGS etc. unmodified in configure.ac ...even if they are modified for the remaineder of configure.ac itself in the MSVC 2015-specific code checking for UCRT. Otherwise, the flags determined by LinkTarget.mk would lack any debug and optimization flags when building with MSVC 2015. Change-Id: Ib78418e0ad04bf2eae16a14b5c0904ba4f582eca Reviewed-on: https://gerrit.libreoffice.org/34248 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit ed4b23548d28941f9b2c75207832afcb6c6ad0b3) Reviewed-on: https://gerrit.libreoffice.org/69176 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/configure.ac b/configure.ac index b7ec09a5f4ab..a8026700e3b1 100644 --- a/configure.ac +++ b/configure.ac @@ -926,6 +926,75 @@ AC_SUBST(WITH_MINGW) AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) +# Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS. +# By default use the ones specified by our build system, +# but explicit override is possible. +AC_MSG_CHECKING(for explicit AFLAGS) +if test -n "$AFLAGS"; then +AC_MSG_RESULT([$AFLAGS]) +x_AFLAGS= +else +AC_MSG_RESULT(no) +x_AFLAGS=[\#] +fi +AC_MSG_CHECKING(for explicit CFLAGS) +if test -n "$CFLAGS"; then +AC_MSG_RESULT([$CFLAGS]) +x_CFLAGS= +else +AC_MSG_RESULT(no) +x_CFLAGS=[\#] +fi +AC_MSG_CHECKING(for explicit CXXFLAGS) +if test -n "$CXXFLAGS"; then +AC_MSG_RESULT([$CXXFLAGS]) +x_CXXFLAGS= +else +AC_MSG_RESULT(no) +x_CXXFLAGS=[\#] +fi +AC_MSG_CHECKING(for explicit OBJCFLAGS) +if test -n "$OBJCFLAGS"; then +AC_MSG_RESULT([$OBJCFLAGS]) +x_OBJCFLAGS= +else +AC_MSG_RESULT(no) +x_OBJCFLAGS=[\#] +fi +AC_MSG_CHECKING(for explicit OBJCXXFLAGS) +if test -n "$OBJCXXFLAGS"; then +AC_MSG_RESULT([$OBJCXXFLAGS]) +x_OBJCXXFLAGS= +else +AC_MSG_RESULT(no) +x_OBJCXXFLAGS=[\#] +fi +AC_MSG_CHECKING(for explicit LDFLAGS) +if test -n "$LDFLAGS"; then +AC_MSG_RESULT([$LDFLAGS]) +x_LDFLAGS= +else +AC_MSG_RESULT(no) +x_LDFLAGS=[\#] +fi +AC_SUBST(AFLAGS) +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(OBJCFLAGS) +AC_SUBST(OBJCXXFLAGS) +AC_SUBST(LDFLAGS) +AC_SUBST(x_AFLAGS) +AC_SUBST(x_CFLAGS) +AC_SUBST(x_CXXFLAGS) +AC_SUBST(x_OBJCFLAGS) +AC_SUBST(x_OBJCXXFLAGS) +AC_SUBST(x_LDFLAGS) + +dnl These are potentially set for MSVC, in the code checking for UCRT below: +my_original_CFLAGS=$CFLAGS +my_original_CXXFLAGS=$CXXFLAGS +my_original_CPPFLAGS=$CPPFLAGS + dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32) dnl Needs to precede the AC_SEARCH_LIBS call below, which apparently calls dnl AC_PROG_CC internally. @@ -4039,70 +4108,6 @@ if test "$enable_release_build" != yes -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE fi AC_SUBST(XCODE_DEBUG_INFORMATION_FORMAT) -# Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS. -# By default use the ones specified by our build system, -# but explicit override is possible. -AC_MSG_CHECKING(for explicit AFLAGS) -if test -n "$AFLAGS"; then -AC_MSG_RESULT([$AFLAGS]) -x_AFLAGS= -else -AC_MSG_RESULT(no) -x_AFLAGS=[\#] -fi -AC_MSG_CHECKING(for explicit CFLAGS) -if test -n "$CFLAGS"; then -AC_MSG_RESULT([$CFLAGS]) -x_CFLAGS= -else -AC_MSG_RESULT(no) -x_CFLAGS=[\#] -fi -AC_MSG_CHECKING(for explicit CXXFLAGS) -if test -n "$CXXFLAGS"; then -AC_MSG_RESULT([$CXXFLAGS]) -x_CXXFLAGS= -else -AC_MSG_RESULT(no) -x_CXXFLAGS=[\#] -fi -AC_MSG_CHECKING(for explicit OBJCFLAGS) -if test -n "$OBJCFLAGS"; then -AC_MSG_RESULT([$OBJCFLAGS]) -x_OBJCFLAGS= -else -AC_MSG_RESULT(no) -x_OBJCFLAGS=[\#] -fi -AC_MSG_CHECKING(for explicit OBJCXXFLAGS) -if test -n "$OBJCXXFLAGS"; then -AC_MSG_RESULT([$OBJCXXFLAGS]) -x_OBJCXXFLAGS= -else -AC_MSG_RESULT(no) -x_OBJCXXFLAGS=[\#] -fi -AC_MSG_CHECKING(for explicit LDFLAGS) -if test -n "$LDFLAGS"; then -AC_MSG_RESULT([$LDFLAGS]) -x_LDFLAGS= -else -AC_MSG_RESULT(no) -x_LDFLAGS=[\#] -fi -AC_SUBST(AFLAGS) -AC_SUBST(CFLAGS) -AC_SUBST(CXXFLAGS) -AC_SUBST(OBJCFLAGS) -AC_SUBST(OBJCXXFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(x_AFLAGS) -AC_SUBST(x_CFLAGS) -AC_SUBST(x_CXXFLAGS) -AC_SUBST(x_OBJCFLAGS) -AC_SUBST(x_OBJCXXFLAGS) -AC_SUBST(x_LDFLAGS) - # # determine CPUNAME, OS, ... # The USING_X11 flag tells whether the host os uses X by default. Can be overriden with the --without-x option. @@ -13185,6 +13190,10 @@ if test -f config_host_lang.mk; then config_lang_md5=`$MD5SUM config_host_lang.mk | sed "s/ .*//"` fi +CFLAGS=$my_original_CFLAGS +CXXFLAGS=$my_original_CXXFLAGS
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac
configure.ac | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 1457c6d4adae3fa3cbc5c25dafc64de849420f9e
Author: Juergen Funk
AuthorDate: Wed Sep 5 15:36:23 2018 +0200
Commit: Thorsten Behrens
CommitDate: Tue Sep 25 00:12:31 2018 +0200
Improve the Windows SDK 10 ProductVersion-Path
At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB)
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)
Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60684
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 00807ded1efe..b7ec09a5f4ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5345,17 +5345,16 @@ find_winsdk_version()
if test -n "$regvalue"; then
winsdkbinsubdir="$regvalue".0
fi
-winsdklibsubdir=$regvalue
-if test "$regvalue" = "10.0.14393"; then
-winsdklibsubdir="10.0.14393.0"
-elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.15063.0"
-dnl Hack needed at least by tml:
-if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
--a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
-then
-winsdklibsubdir="10.0.14393.0"
-fi
+winsdklibsubdir=$winsdkbinsubdir
+tmppath="$winsdktest\\Include\\$winsdklibsubdir"
+# test exist the SDK path
+if test -d "$tmppath"; then
+ # when path is convertable to a short path then path is okay
+ if ! cygpath -d "$tmppath"; then
+ AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see
NtfsDisable8dot3NameCreation])
+ fi
+else
+ AC_MSG_ERROR([The Windows SDK not found, check the
installation])
fi
return
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst external/Module_external.mk external/python33
configure.ac| 33
download.lst|7
external/Module_external.mk |2
external/python33/ExternalPackage_python3.mk| 829 --
external/python33/ExternalProject_python3.mk| 148 -
external/python33/GeneratedPackage_python3.mk | 18
external/python33/Makefile |7
external/python33/Module_python33.mk| 24
external/python33/README|1
external/python33/UnpackedTarball_python3.mk| 61
external/python33/clang-cl.patch.0 | 11
external/python33/i100492-freebsd.patch.1 | 80 -
external/python33/python-3.3.0-clang.patch.1| 13
external/python33/python-3.3.0-darwin.patch.1 | 85 -
external/python33/python-3.3.0-gcc-4.8.patch.1 | 15
external/python33/python-3.3.0-i42553.patch.2 | 18
external/python33/python-3.3.0-msvc-disable.patch.1 | 47
external/python33/python-3.3.0-msvc-x64.patch.1 | 289 ---
external/python33/python-3.3.0-msvc2012.patch.1 | 72
external/python33/python-3.3.0-pythreadstate.patch.1| 15
external/python33/python-3.3.0-ssl.patch.1 | 208 --
external/python33/python-3.3.3-aix.patch.1 | 145 -
external/python33/python-3.3.3-disable-obmalloc.patch.0 | 21
external/python33/python-3.3.3-elf-rpath.patch.1| 13
external/python33/python-3.3.3-msvc2012-winxp.patch.1 | 117 -
external/python33/python-3.3.3-py17797.patch.1 | 45
external/python33/python-3.3.5-darwin-gnu-xargs.patch.1 | 12
external/python33/python-3.3.5-pyexpat-symbols.patch.1 | 28
external/python33/python-3.3.5-vs2013.patch.1 | 14
external/python33/python-lsan.patch.0 | 19
external/python33/python-msvc-disable-sse2.patch.1 | 23
external/python33/python-vc2013.patch.1 | 1213
external/python33/ubsan.patch.0 | 79 -
33 files changed, 7 insertions(+), 3705 deletions(-)
New commits:
commit a5f0e613a5b2017c8e9a9373f3c175529d321bb2
Author: David Ostrovsky
AuthorDate: Sun Jan 22 22:54:44 2017 +0100
Commit: Thorsten Behrens
CommitDate: Thu Aug 16 15:54:12 2018 +0200
Drop support for MSVC 2013
Reviewed-on: https://gerrit.libreoffice.org/22588
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 84b36c704d73362d4d86dc9e9c0efa0625958347)
Conflicts:
configure.ac
download.lst
external/python33/ExternalPackage_python3.mk
external/python33/ExternalProject_python3.mk
external/python33/Module_python33.mk
external/python33/UnpackedTarball_python3.mk
external/python33/clang-cl.patch.0
Change-Id: Ibf47c9ff7b5fb098e284a58c547b61286264dd80
diff --git a/configure.ac b/configure.ac
index 71775caff9df..00807ded1efe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3299,8 +3299,6 @@ map_vs_year_to_version()
unset vsversion
case $1 in
-2013)
-vsversion=12.0;;
2015)
vsversion=14.0;;
*)
@@ -3395,7 +3393,7 @@ find_ucrt()
find_msvc()
{
-# Find Visual C++ 2013/2015
+# Find Visual C++ 2015
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
@@ -3418,10 +3416,6 @@ find_msvc()
if test -n "$vctest"; then
vcnumwithdot=$ver
case "$vcnumwithdot" in
-12.0)
-vcyear=2013
-vcnum=120
-;;
14.0)
vcyear=2015
vcnum=140
@@ -3447,7 +3441,7 @@ if test "$_os" = "WINNT"; then
if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio
installation found])
else
-AC_MSG_ERROR([No Visual Studio 2013/2015 installation found])
+AC_MSG_ERROR([No Visual Studio 2015 installation found])
fi
fi
@@ -3515,10 +3509,6 @@ if test "$_os" = "WINNT"; then
# Find the version of devenv.exe
DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
-if test ! -e "$DEVENV" -a "$vcnum" = "120"; then
-# for Visual Studio 2013 Express, fall back
-DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/WDExpress.exe"
-fi
if test ! -e "$DEVENV"; then
AC_MSG_ERROR([No devenv.exe found, Visual Studio installation
broken?])
fi
@@ -5393,7 +5383,7 @@ find_msms()
my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
AC_MSG_CHECKING([for $my_msm_file])
msmdir=
-for ver in 12.0 14.0; do
+for ver in 14.0; do
reg_get_value_32
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac
configure.ac | 326 ---
1 file changed, 180 insertions(+), 146 deletions(-)
New commits:
commit 493e4afb5b3d1780f1b5aeaa7c1a2a4de25ba5a2
Author: Thorsten Behrens
AuthorDate: Mon Jul 23 03:07:29 2018 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jul 23 03:10:21 2018 +0200
Fix VS2015 build in the presence of newer SDKs
This broke e.g. when installing VS2017 alongside - following
commits or partial commits from master are included:
- Fix include and library paths for at least me
(cherry picked from commit b076e8f673d1714ee8b6f991eb2ca299b6fa8949)
Change-Id: I647ec1d0924ba4c743e4c16d2fa0a05014e0b2e3
- Adapt to Windows SDK 10.0.15063
(cherry picked from commit a4d1ed6ba2a81b4284cd360f44b6723bc9bfaf85)
Change-Id: Ia403e4bde7b1abf7e2c9d9f084a05af2d1311617
- Part of 'Support MSVC 15.0'
(cherry picked from commit b862cbdd345ec57c2595629ded6a3969e1e65d56)
Change-Id: Id5783ac6a01612475ac2b62856a793337865d709
- Lets see if basing WINDOWS_SDK_BINDIR_NO_ARCH on WINDOWS_SDK_HOME works
better
(cherry picked from commit e8ffe54dec568332c301f8510f3186c04421b911)
Change-Id: I13a369ba34b63392ec42333dbc1e538b49a24ca1
Change-Id: I13a369ba34b63392ec42333dbc1e538b59a24ca1
Reviewed-on: https://gerrit.libreoffice.org/57835
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 050abf42f794..87f3bd45369f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3369,12 +3369,26 @@ find_ucrt()
UCRTSDKDIR=$formatted_path
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v10.0/ProductVersion"
UCRTVERSION=$regvalue
+# Rest if not exist
+if ! test -d "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"; then
+ UCRTSDKDIR=
+ AC_MSG_RESULT([UCRT: give up registry detection and retrieve from
IDE env file])
+fi
fi
if test -z "$UCRTSDKDIR"; then
if test -f "$VC_PRODUCT_DIR/../Common7/Tools/vsvars32.bat"; then
PathFormat "`win_get_env_from_vsvars32bat "UniversalCRTSdkDir"`"
UCRTSDKDIR=$formatted_path
-UCRTVERSION=`win_get_env_from_vsvars32bat "UCRTVersion"`
+UCRTVERSION=$(win_get_env_from_vsvars32bat UCRTVersion)
+dnl Hack needed at least by tml:
+if test "$UCRTVERSION" = 10.0.15063.0 \
+-a ! -f "${UCRTSDKDIR}Include/10.0.15063.0/um/sqlext.h" \
+-a -f "${UCRTSDKDIR}Include/10.0.14393.0/um/sqlext.h"
+then
+UCRTVERSION=10.0.14393.0
+fi
+else
+ AC_MSG_ERROR([No UCRT found])
fi
fi
}
@@ -5307,9 +5321,9 @@ find_dotnetsdk46()
find_winsdk_version()
{
# Args: $1 : SDK version as in "6.0A", "7.0" etc
-# Return values: $winsdktest, $winsdklibsubdir
+# Return values: $winsdktest, $winsdkbinsubdir, $winsdklibsubdir
-unset winsdktest winsdklibsubdir
+unset winsdktest winsdkbinsubdir winsdklibsubdir
# Why we look for them in this particular order I don't know. But OTOH I
case "$1" in
@@ -5342,7 +5356,21 @@ find_winsdk_version()
if test -n "$regvalue"; then
winsdktest=$regvalue
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v${1}/ProductVersion"
+if test -n "$regvalue"; then
+winsdkbinsubdir="$regvalue".0
+fi
winsdklibsubdir=$regvalue
+if test "$regvalue" = "10.0.14393"; then
+winsdklibsubdir="10.0.14393.0"
+elif test "$regvalue" = "10.0.15063"; then
+winsdklibsubdir="10.0.15063.0"
+dnl Hack needed at least by tml:
+if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
+-a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
+then
+winsdklibsubdir="10.0.14393.0"
+fi
+fi
return
fi
;;
@@ -5352,7 +5380,7 @@ find_winsdk_version()
find_winsdk()
{
# Args: $1 (optional) : list of acceptable SDK versions
-# Return value: $winsdktest
+# Return value: From find_winsdk_version
unset winsdktest
@@ -5424,15 +5452,137 @@ find_msvc_x64_dlls()
done
}
+dnl =
+dnl Check for the Windows SDK.
+dnl =
+if test "$_os" = "WINNT"; then
+AC_MSG_CHECKING([for Windows SDK])
+if test "$build_os" = "cygwin"; then
+find_winsdk
+WINDOWS_SDK_HOME=$winsdktest
+
+# normalize if found
+if test -n "$WINDOWS_SDK_HOME"; then
+WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
+WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+fi
+
+
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 083673e9c852fec9c1f1caf28714f1d7266aa89d
Author: Michael Stahl
Date: Thu Jun 28 18:30:28 2018 +0200
python3: upgrade to release 3.5.5
Fixes CVE-2017-1000158.
Change-Id: I1871f031e3431253a3403f2ea2b586bcc4aa1016
Reviewed-on: https://gerrit.libreoffice.org/56609
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf)
Reviewed-on: https://gerrit.libreoffice.org/56684
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 816410692087..050abf42f794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8298,7 +8298,7 @@ internal)
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
else
PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
fi
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
diff --git a/download.lst b/download.lst
index 6309c54993a5..49ed2b743f72 100644
--- a/download.lst
+++ b/download.lst
@@ -137,8 +137,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
export PYTHON_TARBALL := Python-3.3.5.tgz
else
-export PYTHON_MD5SUM := 2ed4802b7a2a7e40d2e797272bf388ec
-export PYTHON_TARBALL := Python-3.5.4.tgz
+export PYTHON_MD5SUM := f3763edf9824d5d3a15f5f646083b6e0
+export PYTHON_TARBALL := Python-3.5.5.tar.xz
endif
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac
configure.ac |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 6337263829bd36f38467781dce326a38aa115374
Author: Michael Stahl
Date: Tue Aug 22 22:26:43 2017 +0200
configure: try to keep PYTHON_VERSION from going stale
Since it was set to 3.5.0, the bundled python was upgraded twice, but
the directory is still named python-core-3.5.0 :(
Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a
Reviewed-on: https://gerrit.libreoffice.org/41433
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5)
Reviewed-on: https://gerrit.libreoffice.org/56683
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 7abc5c56653c..816410692087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8295,10 +8295,14 @@ internal)
# when MSVC 2013 support was dropped.
if test "$COM" = "MSC" -a "$VCVER" = "120"; then
PYTHON_VERSION_MINOR=3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
else
PYTHON_VERSION_MINOR=5
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+fi
+if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
+AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac
configure.ac | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) New commits: commit eaf14ee264dc266586831e234c81662693eb5ea6 Author: Thorsten Behrens Date: Fri Jun 29 11:20:57 2018 +0200 Only supported MSVS version on this branch is VS2015 Due to 3rd party dependencies requiring better C++11 support Change-Id: Ic603ce6567e21f809eda042e981e4dc099b64f43 diff --git a/configure.ac b/configure.ac index 558e31d6d5b5..7abc5c56653c 100644 --- a/configure.ac +++ b/configure.ac @@ -2097,13 +2097,6 @@ AC_ARG_WITH(doxygen, documentation. Not relevant in the --disable-odk case.]), ,with_doxygen=yes) -AC_ARG_WITH(visual-studio, -AS_HELP_STRING([--with-visual-studio=<2013/2015>], -[Specify which Visual Studio version to use in case several are - installed. If not specified, only 2013 is detected automatically - because 2015 support is currently experimental.]), -,) - AC_ARG_WITH(windows-sdk, AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)/10>], [Specify which Windows SDK, or "Windows Kit", version to use @@ -3326,8 +3319,8 @@ vs_versions_to_check() map_vs_year_to_version "$1" vsversions=$vsversion else -# By default we prefer 2013/2015, in this order -vsversions="12.0 14.0" +# Only support VS2015 going forward +vsversions="14.0" fi } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
