Mercurial > mxe-octave

changeset 4219:c955d4b97330

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't depend on openssl * gdal.mk, postgresql.mk, qt.mk: Disable openssl.
author John W. Eaton <jwe@octave.org>
date Thu, 08 Sep 2016 20:35:36 -0400
parents d46be48af8d9
children 7c07a8b0eaf0
files src/postgresql.mk src/qt.mk
diffstat 2 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/postgresql.mk	Thu Sep 15 13:12:02 2016 -0400
+++ b/src/postgresql.mk	Thu Sep 08 20:35:36 2016 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := postgresql-$($(PKG)_VERSION)
 $(PKG)_FILE     := postgresql-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := zlib openssl
+$(PKG)_DEPS     := zlib
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_FLAGS_OPTION := $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS)
@@ -47,14 +47,14 @@
         --without-pam \
         --without-ldap \
         --without-bonjour \
-        --with-openssl \
+        --without-openssl \
         --without-readline \
         --without-ossp-uuid \
         --without-libxml \
         --without-libxslt \
         --with-zlib \
         --with-system-tzdata=/dev/null \
-        LIBS="$($(PKG)_LIBS) `'$(MXE_PKG_CONFIG)' openssl --libs`"
+        LIBS="$($(PKG)_LIBS)"
     $(MAKE) -C '$(1)'/src/common             -j '$(JOBS)'         
     $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)'
     $(MAKE) -C '$(1)'/src/port             -j '$(JOBS)'         
--- a/src/qt.mk	Thu Sep 15 13:12:02 2016 -0400
+++ b/src/qt.mk	Thu Sep 08 20:35:36 2016 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
+$(PKG)_DEPS     := postgresql freetds zlib libpng jpeg libmng tiff sqlite dbus
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
@@ -45,8 +45,7 @@
     endif
   else
     $(PKG)_CONFIGURE_ENV := \
-      OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \
-      PSQL_LIBS="-lpq -lsecur32 `'$(MXE_PKG_CONFIG)' --libs-only-l openssl` -lws2_32" \
+      PSQL_LIBS="-lpq -lsecur32 `'$(MXE_PKG_CONFIG)'` -lws2_32" \
       SYBASE_LIBS="-lsybdb `'$(MXE_PKG_CONFIG)' --libs-only-l gnutls` -liconv -lws2_32" 
     $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
   endif
@@ -91,11 +90,6 @@
   else
     $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
   endif
-  # OPENSSL_LIBS needs to be specified here, specifying it as environment
-  # variables *before* "configure.exe" doesn't work. Also compile-in D-BUS
-  # support, for what it's worth...
-  $(PKG)_CONFIGURE_EXTRA_OPTION += \
-      OPENSSL_LIBS="`PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' '$(MXE_PKG_CONFIG)' --libs-only-l openssl`"
 else
   $(PKG)_CONFIGURE_CMD := configure
   $(PKG)_CONFIGURE_EXTRA_OPTION := \
@@ -104,6 +98,7 @@
       -no-glib \
       -no-gstreamer \
       -no-javascript-jit \
+      -no-openssl \
       -no-reduce-exports \
       -no-rpath \
       -make translations \
@@ -147,7 +142,6 @@
         -script \
         -no-iconv \
         -opengl desktop \
-        -openssl-linked \
         -no-webkit \
         -no-phonon \
         -no-phonon-backend \