8b2694efb7
* fix build for openssl 1.1.1b required for sdk (cherry picked from commit aa49e3b2755b97b6331cdbbb89efc954de8d5977) * use js code from master * fix openssl recipe and tweak build (cherry picked from commit 6e94c27021c7bd7b1e880c2fc314850e36a5a38e) * remove unused build recipes (cherry picked from commit f5c0577bdb175bfc0990602936bbc9e2052e1f25)
20 lines
763 B
Diff
20 lines
763 B
Diff
--- openssl/Makefile 2016-01-28 17:26:49.159522273 +0100
|
|
+++ b/Makefile 2016-01-28 17:26:54.358438402 +0100
|
|
@@ -342,7 +342,7 @@
|
|
link-shared:
|
|
@ set -e; for i in $(SHLIBDIRS); do \
|
|
$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
|
|
- LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
|
|
+ LIBNAME=$$i LIBVERSION= \
|
|
LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
|
|
symlink.$(SHLIB_TARGET); \
|
|
libs="$$libs -l$$i"; \
|
|
@@ -356,7 +356,7 @@
|
|
libs="$(LIBKRB5) $$libs"; \
|
|
fi; \
|
|
$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
|
|
- LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
|
|
+ LIBNAME=$$i LIBVERSION= \
|
|
LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
|
|
LIBDEPS="$$libs $(EX_LIBS)" \
|
|
link_a.$(SHLIB_TARGET); \
|