Skip to content

simplify openssl !macos !windows !ios #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eagleoflqj merged 3 commits into from
Dec 21, 2025
Merged

simplify openssl !macos !windows !ios #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23a2918
simplify openssl
eagleoflqj Dec 20, 2025
1c60724
tweak
eagleoflqj Dec 21, 2025
95319ab
lint
eagleoflqj Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions patches/openssl.patch
View file
Open in desktop

This file was deleted.

20 changes: 17 additions & 3 deletions scripts/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ def get_platform_cflags() -> str:
sdk = f'-isysroot {subprocess.check_output("xcrun --sdk iphonesimulator --show-sdk-path", shell=True, text=True).strip()}'
version = f'-mios-simulator-version-min={IOS_VERSION}'
return ' '.join((arch, sdk, version))
if PLATFORM == 'harmony':
return f'-O3 -fPIC --target={OHOS_TARGET}'
if PLATFORM == 'js':
flag = '-fPIC'
if not DEBUG:
Expand Down Expand Up @@ -376,13 +378,25 @@ def configure(self):
])

def build(self):
ensure('make', [
command = [
'-j8',
self.target,
f'CFLAGS="{get_platform_cflags()}"',
f'CXXFLAGS="{get_platform_cflags()}"'
])
]
if PLATFORM == 'harmony':
# Use environment variable so that libcrypto-lib-cversion.o in openssl doesn't contain absolute path of clang.
os.environ['PATH'] = f'{HARMONY_NATIVE}/llvm/bin:{os.environ['PATH']}'
command += [
'CC=clang',
'AR=llvm-ar',
'RANLIB=llvm-ranlib'
]
ensure('make', command)

def install(self):
os.environ['DESTDIR'] = self.dest_dir
ensure('make', ['install'])
ensure('make', [
'install',
f'DESTDIR={self.dest_dir}', # openssl doesn't accept environment variable.
])
38 changes: 4 additions & 34 deletions scripts/openssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import os
from common import HARMONY_NATIVE, INSTALL_PREFIX, OHOS_ARCH, OHOS_TARGET, PLATFORM, Builder, ensure, patch

project = 'openssl'

patch(project)
from common import INSTALL_PREFIX, OHOS_ARCH, MakeBuilder, ensure

os.environ['SOURCE_DATE_EPOCH'] = '0' # Reproducible: crypto/buildinf.h

class OpenSSLBuilder(Builder):
class OpenSSLBuilder(MakeBuilder):
def configure(self):
arch = 'ohos-aarch64' if OHOS_ARCH == 'arm64-v8a' else 'ohos-x86_64'
arch = 'linux-aarch64' if OHOS_ARCH == 'arm64-v8a' else 'linux-x86_64'
ensure('./Configure', [
arch,
f'--prefix={INSTALL_PREFIX}',
Expand All @@ -21,36 +17,10 @@ def configure(self):
*self.options
])

def build(self):
ensure('make', ['clean'])
command = []

cflags = ['-O3', '-fPIC']
if PLATFORM == 'harmony':
cflags += [f'--target={OHOS_TARGET}']

command += [
'make',
'-j8',
f'CFLAGS="{' '.join(cflags)}"'
]

if PLATFORM == 'harmony':
command += [
f'CC={HARMONY_NATIVE}/llvm/bin/clang',
f'AR="{HARMONY_NATIVE}/llvm/bin/llvm-ar"',
f'RANLIB={HARMONY_NATIVE}/llvm/bin/llvm-ranlib'
]

ensure(command[0], command[1:])

def install(self):
ensure('make', ['install', f'DESTDIR={self.dest_dir}'])

def pre_package(self):
ensure('rm', ['-rf',
f'{self.dest_dir}{INSTALL_PREFIX}/bin',
f'{self.dest_dir}{INSTALL_PREFIX}/ssl'
])

OpenSSLBuilder(project).exec()
OpenSSLBuilder('openssl').exec()
Loading