[Libreoffice-commits] core.git: configure.ac download.lst external/openssl Makefile.fetch

[Tor Lillqvist]

 Makefile.fetch                              |    1 -
 configure.ac                                |    9 ---------
 download.lst                                |    2 --
 external/openssl/ExternalProject_openssl.mk |    4 +---
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit b04a27ad6fa1088cc6887ccadab3165c43dfab02
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 9 12:24:32 2016 +0200

    Revert "Add --with-prebuilt-openssl"
    
    Building OpenSSL works fine for me now with a fresh Cygwin.
    
    Change-Id: Ic824704746ab59324e7a533b6c5545b6f1aa59f6

diff --git a/Makefile.fetch b/Makefile.fetch
index 633202e..3884f7f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -194,7 +194,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
 		$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
 		$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
-		$(call fetch_Optional,PREBUILT_OPENSSL,PREBUILT_OPENSSL_TARBALL) \
 		$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
 		$(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \
 		$(call fetch_Optional,REDLAND,RASQAL_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 7b5cedd..cd3d79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1492,11 +1492,6 @@ AC_ARG_ENABLE(openssl,
          use only if you are hacking on it.]),
 ,enable_openssl=yes)
 
-AC_ARG_WITH(prebuilt-openssl,
-    AS_HELP_STRING([--with-prebuilt-openssl],
-        [Don't build OpenSSL but use prebuilt binaries. Only for use on Windows, when you can't build it,
-         thanks to the Cygwin fork() problem when running the Perl disaster in OpenSSL's build system.]))
-
 AC_ARG_ENABLE(library-bin-tar,
     AS_HELP_STRING([--enable-library-bin-tar],
         [Enable the building and reused of tarball of binary build for some 'external' libraries.
@@ -9022,10 +9017,6 @@ if test "$with_system_nss" = "yes"; then
     libo_MINGW_CHECK_DLL([ssl3])
 fi
 
-if test $_os = WINNT -a -z "$ENABLE_RELEASE_BUILD" -a "$with_prebuilt_openssl" = yes; then
-    BUILD_TYPE="$BUILD_TYPE PREBUILT_OPENSSL"
-fi
-
 dnl ===================================================================
 dnl Check for system sane
 dnl ===================================================================
diff --git a/download.lst b/download.lst
index 475112b..600ae5b 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,6 @@ export PNG_TARBALL := libpng-1.6.19.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PREBUILT_OPENSSL_MD5SUM=b91f5c21ab18e8ad993b94092479c39a
-export PREBUILT_OPENSSL_TARBALL=prebuilt-openssl.tar.bz2
 
 ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index 92c751e..9ae7a13 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -60,8 +60,6 @@ OPENSSL_PLATFORM := \
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
-	$(if $(filter PREBUILT_OPENSSL,$(BUILD_TYPE)),\
-		cd $(BUILDDIR) && $(GNUTAR) -x -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(PREBUILT_OPENSSL_TARBALL),\
 	$(call gb_ExternalProject_run,build,\
 		export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
 		&& export PERL="$(shell cygpath -w $(PERL))" \
@@ -71,7 +69,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 		&& unset MAKEFLAGS \
 		&& nmake -f "ms\ntdll.mak" \
 		&& mv inc32/* include/ \
-	))
+	)
 
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):