Skip to content

Commit e2541b4

Browse files
committed
fix: base libs installation prefix includes arch
also build zlib-ng using cmake
1 parent 938e7a7 commit e2541b4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

libs/GNUmakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ all: AR=$(PREFIX)/bin/$(ARCH)-ar
1010
all: $(LIBSSL).orig $(ZLIB).orig $(CURL).orig
1111
cd $(LIBSSL).orig \
1212
&& CC=$(CC) AR=$(AR) CFLAGS="-static -g0 -Os" \
13-
./configure --prefix=$(PREFIX) --disable-shared --disable-tests --disable-dependency-tracking --build=x86_64-linux-musl --host=$(ARCH) \
13+
./configure --prefix=$(PREFIX)/$(ARCH) --disable-shared --disable-tests --disable-dependency-tracking --build=x86_64-linux-musl --host=$(ARCH) \
1414
&& $(MAKE) -j`nproc` && $(MAKE) install
15-
cd $(ZLIB).orig \
15+
mkdir -p $(ZLIB).orig/build && cd $(ZLIB).orig/build \
1616
&& CC=$(CC) AR=$(AR) CFLAGS="-static -g0 -Os" PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \
17-
./configure --prefix=$(PREFIX) --zlib-compat --static \
17+
cmake .. -DZLIB_ENABLE_TESTS=no -DZLIB_COMPAT=yes -DCMAKE_C_COMPILER=$(CC) -DCMAKE_PREFIX_PATH=$(PREFIX) -DCMAKE_INSTALL_PREFIX=$(PREFIX)/$(ARCH) ZLIBNG_ENABLE_TESTS=no WITH_SANITIZER=no WITH_GTEST=no \
1818
&& $(MAKE) -j`nproc` && $(MAKE) install
1919
cd $(CURL).orig \
2020
&& CC=$(CC) AR=$(AR) CFLAGS="-static -g0 -Os" PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \
21-
./configure --prefix=$(PREFIX) --disable-shared --with-zlib=$(PREFIX) --with-openssl --build=x86_64-linux-musl --host=$(ARCH) --with-sysroot=$(PREFIX) --without-libpsl --disable-docs \
21+
./configure --prefix=$(PREFIX)/$(ARCH) --disable-shared --with-zlib=$(PREFIX) --with-openssl --build=x86_64-linux-musl --host=$(ARCH) --with-sysroot=$(PREFIX) --without-libpsl --disable-docs \
2222
&& $(MAKE) -j`nproc` && $(MAKE) install
2323

2424
# upstream: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/

0 commit comments

Comments
 (0)