Skip to content

Commit

Permalink
try without openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
krono committed Sep 7, 2017
1 parent e839f10 commit 7c14856
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 76 deletions.
102 changes: 51 additions & 51 deletions .appveyor.yml
Expand Up @@ -3,46 +3,46 @@ environment:
BINTRAYAPIKEY:
secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
matrix:
- FLAVOR: squeak.sista.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
# - FLAVOR: squeak.sista.spur
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.cog.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.stack.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.stack.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
# - FLAVOR: squeak.cog.v3
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
# - FLAVOR: squeak.stack.spur
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
# - FLAVOR: squeak.stack.v3
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
- FLAVOR: pharo.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: newspeak.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: newspeak.stack.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
# - FLAVOR: newspeak.cog.spur
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
# - FLAVOR: newspeak.stack.spur
# ARCH: win32x86
# CYG_ROOT: C:\cygwin
# CYG_SETUP: setup-x86.exe
# MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
Expand All @@ -53,26 +53,26 @@ environment:
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: newspeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: squeak.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: pharo.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: newspeak.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
# - FLAVOR: newspeak.cog.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
# CYG_SETUP: setup-x86_64.exe
# MINGW_ARCH: x86_64
# - FLAVOR: squeak.stack.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
# CYG_SETUP: setup-x86_64.exe
# MINGW_ARCH: x86_64
# - FLAVOR: pharo.stack.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
# CYG_SETUP: setup-x86_64.exe
# MINGW_ARCH: x86_64
# - FLAVOR: newspeak.stack.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
# CYG_SETUP: setup-x86_64.exe
# MINGW_ARCH: x86_64

matrix:
fast_finish: false
Expand All @@ -88,7 +88,7 @@ cache:
install:
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
- '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,mingw64-%MINGW_ARCH%-openssl,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'
- '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'

build: false

Expand Down
27 changes: 2 additions & 25 deletions platforms/win32/plugins/SqueakSSL/Makefile.plugin
@@ -1,28 +1,5 @@
# Makefile for SqueakSSL plugin. This should work given the right versions of
# things. Alas my current MINGW installation, 3.17, doesn't have an up-to-date
# /usr/lib/w32api/libcrypt32.a; it defines 14 funcs needed by sqWin32SSL.c but
# another 11 are undefined.
# If you want to experiment, download a suitable version of openssl,
# e.g. http://www.openssl.org/source/openssl-1.0.1e.tar.gz
# and unpack it. The below assumes it is unpacked in /usr/local.
# Then in the openssl directory do
# ./Configure mingw
# make
# make test
# Then in cygwinbuild do
# make build/vm/SqueakSSL.dll
# If you get something that works please let me know.
# Eliot Miranda, eliot.miranda@gmail.com, 2013/4/4

ifeq ($(THIRDPARTYOUTDIR),)
OPENSSL:=/usr/local/openssl-1.0.1e
else
OPENSSL:=$(THIRDPARTYOUTDIR)/lib
endif
EXTRALIBS:= -L$(OPENSSL) -lssl -lcrypto -lcrypt32 -lsecur32

# You may need the following to make an internal plugin
DLLTOOLEXTRA := $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
DLLWRAPEXTRA := $(DLLTOOLEXTRA)
# things.
EXTRALIBS:= -lcrypt32 -lsecur32

include ../common/Makefile.plugin

0 comments on commit 7c14856

Please sign in to comment.