Skip to content

Commit 4567eb2

Browse files
Revert "test openssl"
This reverts commit d976fed.
1 parent d976fed commit 4567eb2

3 files changed

Lines changed: 32 additions & 49 deletions

File tree

.github/workflows/ci.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,33 @@ jobs:
393393

394394
- name: Build depends (macOS)
395395
if: matrix.name == 'x86_64-macos'
396-
396+
shell: bash
397397
run: |
398-
398+
set -e
399+
echo "▶ Setting global compiler override…"
400+
401+
mkdir -p fakebin
402+
403+
# cc wrapper used by native_cdrkit / cmake
404+
cat <<'EOF' > fakebin/cc
405+
#!/bin/bash
406+
exec /usr/bin/clang "$@"
407+
EOF
408+
409+
# clang wrapper for things like openssl's util/domd calling 'clang'
410+
cat <<'EOF' > fakebin/clang
411+
#!/bin/bash
412+
exec /usr/bin/clang "$@"
413+
EOF
414+
415+
chmod +x fakebin/cc fakebin/clang
416+
417+
export PATH="$(pwd)/fakebin:$PATH"
418+
419+
echo "▶ Building depends with forced compiler override…"
420+
CC=cc \
421+
CXX=clang++ \
422+
CC_FOR_BUILD=cc \
399423
make $MAKEJOBS -C depends HOST=${{ matrix.host }}
400424
401425
- name: CCache

depends/packages/openssl.mk

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package=openssl
2-
$(package)_version=1.0.2
3-
$(package)_version_suffix=u
4-
$(package)_download_path=https://www.openssl.org/source/old/$($(package)_version)
5-
$(package)_file_name=$(package)-$($(package)_version)$($(package)_version_suffix).tar.gz
6-
$(package)_sha256_hash=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
7-
$(package)_patches=secure_getenv.patch
2+
$(package)_version=1.0.2t
3+
$(package)_download_path=http://slackware.cs.utah.edu/pub/openssl-ftp/source/old/1.0.2/
4+
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc
86

97
define $(package)_set_vars
108
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
@@ -60,14 +58,12 @@ $(package)_config_opts_i686_mingw32=mingw
6058
endef
6159

6260
define $(package)_preprocess_cmds
63-
patch -p1 < $($(package)_patch_dir)/secure_getenv.patch && \
6461
sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
6562
sed -i.old "s|engines apps test|engines|" Makefile.org
6663
endef
6764

6865
define $(package)_config_cmds
69-
./Configure $($(package)_config_opts) && \
70-
make depend
66+
./Configure $($(package)_config_opts) && $(MAKE) depend
7167
endef
7268

7369
define $(package)_build_cmds
@@ -80,4 +76,4 @@ endef
8076

8177
define $(package)_postprocess_cmds
8278
rm -rf share bin etc
83-
endef
79+
endef

depends/patches/openssl/secure_getenv.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)