3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet another fix of the unix static Makefile (#793)

Browse Source
This commit is contained in:
Vojtech Kral 2018-03-14 16:05:51 +01:00 committed by bubnikv
parent 639f2bc2f3
commit 37f1429400
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/deps-build/unix-static/Makefile
View File

@ -67,13 +67,17 @@ $(TBB).tar.gz:
curl -L -o $@ https://github.com/wjakob/tbb/archive/$(TBB_SHA).tar.gz curl -L -o $@ https://github.com/wjakob/tbb/archive/$(TBB_SHA).tar.gz
# Note: libcurl build system seems to be a bit wonky about finding openssl (cf. #2378).
# It seems that currently the only working option is to set a prefix in the openssl build
# and use the `--with-ssl=...` option in libcurl.
# Additionally, pkg-config needs to be installed and openssl libs need to NOT be installed on the build system.
libopenssl: $(OPENSSL).tar.gz libopenssl: $(OPENSSL).tar.gz
tar -zxvf $(OPENSSL).tar.gz tar -zxvf $(OPENSSL).tar.gz
cd $(OPENSSL) && ./config --openssldir=/etc/ssl shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack' cd $(OPENSSL) && ./config --prefix=$(DESTDIR)/usr/local no-shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack'
make -C $(OPENSSL) depend $(MAKE) -C $(OPENSSL) depend
make -C $(OPENSSL) -j$(NPROC) $(MAKE) -C $(OPENSSL) -j$(NPROC)
make -C $(OPENSSL) install DESTDIR=$(DESTDIR) $(MAKE) -C $(OPENSSL) install_sw
$(OPENSSL).tar.gz: $(OPENSSL).tar.gz:
curl -L -o $@ 'https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz' curl -L -o $@ 'https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz'
@ -82,10 +86,9 @@ $(OPENSSL).tar.gz:
libcurl: libopenssl $(CURL).tar.gz libcurl: libopenssl $(CURL).tar.gz
tar -zxvf $(CURL).tar.gz tar -zxvf $(CURL).tar.gz
# Note: It seems setting custom openssl path doesn't work when pkg-config and system openssl devel libs are installed
cd $(CURL) && ./configure \ cd $(CURL) && ./configure \
--enable-static \ --enable-static \
--enable-shared \ --disable-shared \
--with-ssl=$(DESTDIR)/usr/local \ --with-ssl=$(DESTDIR)/usr/local \
--with-pic \ --with-pic \
--enable-ipv6 \ --enable-ipv6 \