RepositoryExternal.mk | 24 ++++++--- android/Bootstrap/Makefile.shared | 2 configure.ac | 6 +- external/epm/ExternalPackage_epm.mk | 20 ------- external/epm/Module_epm.mk | 1 external/fontconfig/ExternalPackage_fontconfig.mk | 18 ------- external/fontconfig/ExternalProject_fontconfig.mk | 2 external/fontconfig/Module_fontconfig.mk | 1 external/freetype/ExternalPackage_freetype.mk | 22 -------- external/freetype/Module_freetype.mk | 1 external/libatomic_ops/ExternalPackage_libatomic_ops.mk | 20 ------- external/libatomic_ops/Module_libatomic_ops.mk | 1 openssl/ExternalPackage_openssl.mk | 5 - python3/python-3.3.0-ssl.patch.1 | 41 +++++++--------- solenv/bin/modules/installer/epmfile.pm | 7 -- 15 files changed, 43 insertions(+), 128 deletions(-)
New commits: commit 19d7c0348d7caadc42d557eb6d7a93446c7cd698 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 13:01:43 2013 +0200 epm: use executables from WORKDIR and clean up configure Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce diff --git a/configure.ac b/configure.ac index ad72a5c..e1d6124 100644 --- a/configure.ac +++ b/configure.ac @@ -7362,6 +7362,7 @@ if test "$enable_epm" = "yes"; then if test "$EPM" = "no" -o "$EPM" = "internal"; then echo "EPM will be built." BUILD_TYPE="$BUILD_TYPE EPM" + EPM=${WORKDIR}/UnpackedTarball/epm/epm else # Gentoo has some epm which is something different... AC_MSG_CHECKING([whether the found epm is the right epm]) @@ -7377,8 +7378,7 @@ if test "$enable_epm" = "yes"; then AC_MSG_RESULT([OK, >= 3.7]) else AC_MSG_RESULT([too old. epm >= 3.7 is required.]) - echo "EPM will be built." - BUILD_TYPE="$BUILD_TYPE EPM" + AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) fi fi fi @@ -7428,7 +7428,7 @@ if test "$enable_epm" = "yes"; then fi if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \ echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then - if test "$EPM" != "no" -a "$EPM" != "internal"; then + if test "$with_epm" = "no" -a "$_os" != "Darwin"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs]) if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then diff --git a/external/epm/ExternalPackage_epm.mk b/external/epm/ExternalPackage_epm.mk deleted file mode 100644 index 793f419..0000000 --- a/external/epm/ExternalPackage_epm.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,epm,epm)) - -$(eval $(call gb_ExternalPackage_use_external_project,epm,epm)) - -$(eval $(call gb_ExternalPackage_add_files,epm,bin,\ - epm \ - epminstall \ - mkepmlist \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/epm/Module_epm.mk b/external/epm/Module_epm.mk index f86455c..1f4ed07 100644 --- a/external/epm/Module_epm.mk +++ b/external/epm/Module_epm.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,epm)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_Module_add_targets,epm,\ - ExternalPackage_epm \ ExternalProject_epm \ UnpackedTarball_epm \ )) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 06897fb..c386465 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -722,13 +722,6 @@ sub find_epm_on_system { $epmname = $ENV{'EPM'}; } - elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") ) - { - $epmname = "epm"; - my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0); - if ($$epmref eq "") { installer::exiter::exit_program("ERROR: Could not find program $epmname (EPM set to \"internal\" or \"no\")!", "find_epm_on_system"); } - $epmname = $$epmref; - } else { installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system"); commit b308526fbc07753aca7186ab84e92ae8d56d7652 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 12:22:58 2013 +0200 libatomic_ops: use libraries from WORKDIR Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 38fb470..9a138b5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -688,17 +688,23 @@ $(LIBATOMIC_OPS_CFLAGS) \ $$(INCLUDE) \ $(LIBATOMIC_OPS_CFLAGS) \ ) -$(call gb_LinkTarget_use_package,$(1),\ +$(call gb_LinkTarget_use_external_project,$(1),\ libatomic_ops \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - libatomic_ops \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs -latomic_ops-7.2d \ +) +endif endef define gb_ExternalProject__use_libatomic_ops -$(call gb_ExternalProject_use_package,$(1),libatomic_ops) +$(call gb_ExternalProject_use_external_project,$(1),libatomic_ops) endef diff --git a/external/libatomic_ops/ExternalPackage_libatomic_ops.mk b/external/libatomic_ops/ExternalPackage_libatomic_ops.mk deleted file mode 100644 index a7615f6..0000000 --- a/external/libatomic_ops/ExternalPackage_libatomic_ops.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,libatomic_ops,libatomic_ops)) - -$(eval $(call gb_ExternalPackage_use_external_project,libatomic_ops,libatomic_ops)) - -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/atomic_ops-7.2d.lib,src/lib/.libs/libatomic_ops-7.2d.lib)) -else -$(eval $(call gb_ExternalPackage_add_file,libatomic_ops,lib/libatomic_ops-7.2d.a,src/lib/.libs/libatomic_ops-7.2d.a)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 7e1b5ee..7dca670 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,libatomic_ops)) $(eval $(call gb_Module_add_targets,libatomic_ops,\ ExternalProject_libatomic_ops \ - ExternalPackage_libatomic_ops \ UnpackedTarball_libatomic_ops \ )) commit b242cee828704e136a47165fb473513b9b909b27 Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 12:08:50 2013 +0200 freetype: use libraries from WORKDIR Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2c16904..38fb470 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1081,6 +1081,7 @@ gb_ExternalProject__use_freetype := else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_freetype_headers +$(call gb_LinkTarget_use_external_project,$(1),freetype) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ $$(INCLUDE) \ @@ -1094,7 +1095,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers) endef define gb_ExternalProject__use_freetype -$(call gb_ExternalProject_use_package,$(1),freetype) +$(call gb_ExternalProject_use_external_project,$(1),freetype) endef diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 73d7d0a..b5368f4 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -90,6 +90,7 @@ LIBS = \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/freetype/objs/.libs/libfreetype.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index a956e70..74438d0 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --with-arch=arm \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ - --with-freetype-config=$(OUTDIR)/bin/freetype-config \ + --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) \ ) diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk deleted file mode 100644 index 87067ad..0000000 --- a/external/freetype/ExternalPackage_freetype.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_add_files,freetype,lib,\ - objs/.libs/libfreetype.a \ -)) - -$(eval $(call gb_ExternalPackage_add_files,freetype,bin,\ - builds/unix/freetype-config \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index e0965a0..51badc8 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,freetype)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,freetype,\ - ExternalPackage_freetype \ ExternalProject_freetype \ UnpackedTarball_freetype \ )) commit 76596b39484fdc3ffd54f68b966574ff4651ad8e Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 11:01:41 2013 +0200 fontconfig: use libraries from WORKDIR Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1f4ab02..2c16904 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1115,6 +1115,7 @@ endef else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_fontconfig +$(call gb_LinkTarget_use_external_project,$(1),fontconfig) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ $$(INCLUDE) \ diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 0d1bfc1..73d7d0a 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -89,6 +89,7 @@ LIBS = \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ diff --git a/external/fontconfig/ExternalPackage_fontconfig.mk b/external/fontconfig/ExternalPackage_fontconfig.mk deleted file mode 100644 index bee7f01..0000000 --- a/external/fontconfig/ExternalPackage_fontconfig.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig)) - -$(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig)) - -$(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\ - src/.libs/libfontconfig.a \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk index 1bfcbdb..764af35 100644 --- a/external/fontconfig/Module_fontconfig.mk +++ b/external/fontconfig/Module_fontconfig.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,fontconfig)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,fontconfig,\ - ExternalPackage_fontconfig \ ExternalProject_fontconfig \ UnpackedTarball_fontconfig \ )) commit 5b90662d7a93cc0e77501ad2487f5e136bbc3fbf Author: Michael Stahl <mst...@redhat.com> Date: Thu Oct 24 00:22:20 2013 +0200 openssl: use libraries from WORKDIR Change-Id: I1e7a75ad4c8d35cb6adef8d6c4104f1955ad4574 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 969f575..1f4ab02 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1338,9 +1338,9 @@ endef define gb_LinkTarget__use_openssl $(call gb_LinkTarget_use_package,$(1),openssl) ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ - crypto \ - ssl \ +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ diff --git a/openssl/ExternalPackage_openssl.mk b/openssl/ExternalPackage_openssl.mk index 8d19869..df837ae 100644 --- a/openssl/ExternalPackage_openssl.mk +++ b/openssl/ExternalPackage_openssl.mk @@ -12,13 +12,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl)) $(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl)) ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_files,openssl,lib,\ - out32dll/ssleay32.lib \ - out32dll/libeay32.lib \ -)) $(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\ out32dll/ssleay32.dll \ out32dll/libeay32.dll \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 index a7c4c40..d5777df 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/python3/python-3.3.0-ssl.patch.1 @@ -56,7 +56,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -74,7 +74,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -92,7 +92,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -110,7 +110,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -128,7 +128,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -146,7 +146,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" TargetMachine="17" /> <Tool @@ -164,7 +164,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -182,7 +182,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" TargetMachine="17" /> <Tool @@ -214,7 +214,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -231,7 +231,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -245,7 +245,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -262,7 +262,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> @@ -276,7 +276,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'"> @@ -293,7 +293,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -308,7 +308,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'"> @@ -325,7 +325,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </PreLinkEvent> <Link> - <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -347,20 +347,19 @@ diff -ru python3.old_/setup.py python3/setup.py exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) -+ ooosslinc = os.environ.get('WORKDIR') + '/' + \ ++ ooosslinc = os.environ.get('WORKDIR') + \ + '/UnpackedTarball/openssl/include/' search_for_ssl_incs_in = [ + ooosslinc, '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] -@@ -769,8 +774,13 @@ +@@ -769,8 +774,12 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h -+ ooossllib = os.environ.get('SOLARVER') + '/' + \ -+ os.environ.get('INPATH') + '/' + \ -+ 'lib' ++ ooossllib = os.environ.get('WORKDIR') + \ ++ '/UnpackedTarball/openssl' + ooosslinc = ooosslinc + '/' ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits