diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-10-29 09:53:48 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-10-29 09:53:48 +0000 |
| commit | 8e2106488a812dbb316776940a3b552a31b88549 (patch) | |
| tree | c49b945da7e46ba049138a88a082cf0dfa37326a /package/libs/cyassl/patches/120-makefile_destdir.patch | |
| parent | f7ccdbec754cf1d626524db1e65e9a86243424de (diff) | |
| download | mtk-20170518-8e2106488a812dbb316776940a3b552a31b88549.zip mtk-20170518-8e2106488a812dbb316776940a3b552a31b88549.tar.gz mtk-20170518-8e2106488a812dbb316776940a3b552a31b88549.tar.bz2 | |
Revert "[cyassl]: upgrade to 2.8.0"
Reverts the CyaSSL version bump for now since the update completely broke
trunk building due to incompatible changes in the IO callback API which in
turn breaks the core ustream-ssl package.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 38576
Diffstat (limited to 'package/libs/cyassl/patches/120-makefile_destdir.patch')
| -rw-r--r-- | package/libs/cyassl/patches/120-makefile_destdir.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/package/libs/cyassl/patches/120-makefile_destdir.patch b/package/libs/cyassl/patches/120-makefile_destdir.patch new file mode 100644 index 0000000..fe7f508 --- /dev/null +++ b/package/libs/cyassl/patches/120-makefile_destdir.patch @@ -0,0 +1,71 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,19 +10,19 @@ basic: + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +- ln -s ../src/.libs/libcyassl.a libssl.a; \ +- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ ++ ln -s ../src/.libs/libcyassl.a libssl.a; \ ++ ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ + + # !!! test -e with a .name like .libs then a * like *dylib fails so just + # look for the .dylib on OS X, and .so otherwise but copy all parts + install: +- $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \ +- cp -fpR include/* $(DESTDIR)$(includedir); \ +- cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \ +- cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ +- if test -e src/.libs/libcyassl.a; then \ +- cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.so; then \ +- cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.dylib; then \ +- cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ ++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ ++ if test -e src/.libs/libcyassl.a; then \ ++ cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.so; then \ ++ cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.dylib; then \ ++ cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; +--- a/Makefile.in ++++ b/Makefile.in +@@ -647,22 +647,22 @@ basic: + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +- ln -s ../src/.libs/libcyassl.a libssl.a; \ +- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ ++ ln -s ../src/.libs/libcyassl.a libssl.a; \ ++ ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ + + # !!! test -e with a .name like .libs then a * like *dylib fails so just + # look for the .dylib on OS X, and .so otherwise but copy all parts + install: +- $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \ +- cp -fpR include/* $(DESTDIR)$(includedir); \ +- cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \ +- cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ +- if test -e src/.libs/libcyassl.a; then \ +- cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.so; then \ +- cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.dylib; then \ +- cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ ++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ ++ if test -e src/.libs/libcyassl.a; then \ ++ cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.so; then \ ++ cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.dylib; then \ ++ cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |