Fix name clashes with ever-occurring libssl patches.

This commit is contained in:
Paul Sokolovsky 2015-07-09 13:20:59 +03:00
parent 715848aea1
commit 6181bd40aa

View File

@ -69,8 +69,8 @@ libcirom: $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/lib/libcirom.a
sdk_patch: .sdk_patch_$(VENDOR_SDK) sdk_patch: .sdk_patch_$(VENDOR_SDK)
.sdk_patch_1.2.0: libssl_patch_1.2.0.zip libsmartconfig_2.4.2.zip empty_user_rf_pre_init.o .sdk_patch_1.2.0: libssl_patch_1.2.0-1.zip libsmartconfig_2.4.2.zip empty_user_rf_pre_init.o
$(UNZIP) libssl.zip $(UNZIP) libssl_patch_1.2.0-1.zip
$(UNZIP) libsmartconfig_2.4.2.zip $(UNZIP) libsmartconfig_2.4.2.zip
mv libsmartconfig_2.4.2.a $(VENDOR_SDK_DIR_1.2.0)/lib/libsmartconfig.a mv libsmartconfig_2.4.2.a $(VENDOR_SDK_DIR_1.2.0)/lib/libsmartconfig.a
mv libssl.a $(VENDOR_SDK_DIR_1.2.0)/lib/ mv libssl.a $(VENDOR_SDK_DIR_1.2.0)/lib/
@ -174,8 +174,8 @@ scan_issue_test.zip:
wget --content-disposition "http://bbs.espressif.com/download/file.php?id=525" wget --content-disposition "http://bbs.espressif.com/download/file.php?id=525"
1.1.2_patch_02.zip: 1.1.2_patch_02.zip:
wget --content-disposition "http://bbs.espressif.com/download/file.php?id=546" wget --content-disposition "http://bbs.espressif.com/download/file.php?id=546"
libssl_patch_1.2.0.zip: libssl_patch_1.2.0-1.zip:
wget --content-disposition "http://bbs.espressif.com/download/file.php?id=583" wget --content-disposition "http://bbs.espressif.com/download/file.php?id=583" -O $@
libsmartconfig_2.4.2.zip: libsmartconfig_2.4.2.zip:
wget --content-disposition "http://bbs.espressif.com/download/file.php?id=585" wget --content-disposition "http://bbs.espressif.com/download/file.php?id=585"