diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-01-16 07:09:10 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-01-16 07:09:10 +0100 |
| commit | 17f2b5921e02ab6185a3110a96502c17ffe22749 (patch) | |
| tree | 2440d3bf823e457fa3f1b836515c7da0bc9a483f /templates | |
| parent | 3903bcf42c111be41568e146d52a91c2c52227b1 (diff) | |
Fixing parallel build.
The source code of the libraries depends on openssl being built, as it will setup the headers.
Since we don't know exactly which source depends on openssl (we could start flagging it in build.json, but that'd be painful), we just flag all the source for every ssl-enabled library to depend on openssl being built.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 25bc4069a1..9a49935e49 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -318,18 +318,20 @@ run_dep_checks: $(ZLIB_CHECK_CMD) || true libs/$(CONFIG)/zlib/libz.a: - (cd third_party/zlib ; CC="$(CC)" CFLAGS="-fPIC -fvisibility=hidden $(CPPFLAGS_$(CONFIG))" ./configure --static) - $(MAKE) -C third_party/zlib clean - $(MAKE) -C third_party/zlib - mkdir -p libs/$(CONFIG)/zlib - cp third_party/zlib/libz.a libs/$(CONFIG)/zlib + $(E) "[MAKE] Building zlib" + $(Q)(cd third_party/zlib ; CC="$(CC)" CFLAGS="-fPIC -fvisibility=hidden $(CPPFLAGS_$(CONFIG))" ./configure --static) + $(Q)$(MAKE) -C third_party/zlib clean + $(Q)$(MAKE) -C third_party/zlib + $(Q)mkdir -p libs/$(CONFIG)/zlib + $(Q)cp third_party/zlib/libz.a libs/$(CONFIG)/zlib libs/$(CONFIG)/openssl/libssl.a: - (cd third_party/openssl ; CC="$(CC) -fPIC -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG))" ./config $(OPENSSL_CONFIG_$(CONFIG))) - $(MAKE) -C third_party/openssl clean - $(MAKE) -C third_party/openssl build_crypto build_ssl - mkdir -p libs/$(CONFIG)/openssl - cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a libs/$(CONFIG)/openssl + $(E) "[MAKE] Building openssl" + $(Q)(cd third_party/openssl ; CC="$(CC) -fPIC -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG))" ./config $(OPENSSL_CONFIG_$(CONFIG))) + $(Q)$(MAKE) -C third_party/openssl clean + $(Q)$(MAKE) -C third_party/openssl build_crypto build_ssl + $(Q)mkdir -p libs/$(CONFIG)/openssl + $(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a libs/$(CONFIG)/openssl static: static_c static_cxx @@ -658,6 +660,12 @@ endif else +ifneq ($(OPENSSL_DEP),) +% for src in lib.src: +${src}: $(OPENSSL_DEP) +% endfor +endif + libs/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(LIB${lib.name.upper()}_OBJS) % else: libs/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(LIB${lib.name.upper()}_OBJS) |