Skip to content

Commit 147fd39

Browse files
committed
Fix openssl pc file
1 parent 293a95d commit 147fd39

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/SPC/builder/linux/library/openssl.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,25 @@ public function build(): void
6767
shell()->cd($this->source_dir)->initializeEnv($this)
6868
->exec(
6969
"{$env} ./Configure no-shared {$extra} " .
70-
'--prefix=/ ' .
71-
'--libdir=lib ' .
70+
'--prefix=' . BUILD_ROOT_PATH . ' ' .
7271
'--openssldir=/etc/ssl ' .
7372
"{$zlib_extra}" .
7473
'no-legacy ' .
7574
"linux-{$arch}{$clang_postfix}"
7675
)
7776
->exec('make clean')
7877
->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
79-
->exec("make install_sw DESTDIR={$destdir}");
78+
->exec('make install_sw');
8079
$this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
8180
// patch for openssl 3.3.0+
8281
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
83-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
82+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
8483
}
8584
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
86-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
85+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
8786
}
8887
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
89-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
88+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
9089
}
9190
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
9291
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');

src/SPC/builder/macos/library/openssl.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class openssl extends MacOSLibraryBase
3737
*/
3838
protected function build(): void
3939
{
40-
[$lib,,$destdir] = SEPARATED_PATH;
41-
4240
// lib:zlib
4341
$extra = '';
4442
$ex_lib = '';
@@ -52,24 +50,24 @@ protected function build(): void
5250
shell()->cd($this->source_dir)->initializeEnv($this)
5351
->exec(
5452
"./Configure no-shared {$extra} " .
55-
'--prefix=/ ' . // use prefix=/
56-
"--libdir={$lib} " .
53+
'--prefix=' . BUILD_ROOT_PATH . ' ' . // use prefix=/
54+
'--libdir=lib ' .
5755
'--openssldir=/etc/ssl ' .
5856
"darwin64-{$arch}-cc"
5957
)
6058
->exec('make clean')
6159
->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
62-
->exec("make install_sw DESTDIR={$destdir}");
60+
->exec('make install_sw');
6361
$this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
6462
// patch for openssl 3.3.0+
6563
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
66-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
64+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
6765
}
6866
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
69-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
67+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
7068
}
7169
if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
72-
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
70+
FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
7371
}
7472
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
7573
FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');

0 commit comments

Comments
 (0)