From: Raphaël Huck Date: Tue, 2 Mar 2010 16:17:35 +0000 (+0000) Subject: [packages] cyassl: update to 1.4.0 and new patches to fix makefiles X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f214323678dfc9dfd1c5926b820f1b7e4bb3690b;p=openwrt%2Fsvn-archive%2Farchive.git [packages] cyassl: update to 1.4.0 and new patches to fix makefiles SVN-Revision: 19953 --- diff --git a/libs/cyassl/Makefile b/libs/cyassl/Makefile index 2158bb1028..ff84535118 100644 --- a/libs/cyassl/Makefile +++ b/libs/cyassl/Makefile @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyassl -PKG_VERSION:=1.3.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.4.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://www.yassl.com/ -PKG_MD5SUM:=f8b6cdcc2c299c66c74b7e4305745350 +PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c PKG_FIXUP:=libtool +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -36,20 +37,19 @@ endef TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ - --with-zlib="$(STAGING_DIR)/usr" + --with-libz="$(STAGING_DIR)/usr" define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/ctaocrypt - $(CP) $(PKG_BUILD_DIR)/ctaocrypt/include/*.h $(1)/usr/include/ctaocrypt + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/src/libcyassl.la $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.{a,so*,la} $(1)/usr/lib/ endef define Package/libcyassl/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/.libs/libcyassl.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libcyassl)) diff --git a/libs/cyassl/patches/100-makefile_dollar_make.patch b/libs/cyassl/patches/100-makefile_dollar_make.patch new file mode 100644 index 0000000000..07f7a8879e --- /dev/null +++ b/libs/cyassl/patches/100-makefile_dollar_make.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,7 @@ EXTRA_DIST = cyassl.dsp cyassl.dsw certs + doc/*.pdf + + basic: +- cd src; make; cd ../testsuite; make; cd ../ ++ cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../ + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -638,7 +638,7 @@ uninstall-am: + + + basic: +- cd src; make; cd ../testsuite; make; cd ../ ++ cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../ + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ diff --git a/libs/cyassl/patches/110-makefile_disable_examples_tests.patch b/libs/cyassl/patches/110-makefile_disable_examples_tests.patch new file mode 100644 index 0000000000..d991a336df --- /dev/null +++ b/libs/cyassl/patches/110-makefile_disable_examples_tests.patch @@ -0,0 +1,53 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,10 +1,10 @@ +-SUBDIRS = src ctaocrypt examples testsuite ++SUBDIRS = src ctaocrypt + EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \ + lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \ + doc/*.pdf + + basic: +- cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../ ++ cd src; $(MAKE); cd ../ + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -190,7 +190,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src ctaocrypt examples testsuite ++SUBDIRS = src ctaocrypt + EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \ + lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \ + doc/*.pdf +@@ -638,7 +638,7 @@ uninstall-am: + + + basic: +- cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../ ++ cd src; $(MAKE); cd ../ + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +--- a/ctaocrypt/Makefile.am ++++ b/ctaocrypt/Makefile.am +@@ -1,3 +1,3 @@ +-SUBDIRS = src test benchmark ++SUBDIRS = src + EXTRA_DIST = ctaocrypt.dsw ctaocrypt.dsp ctaocrypt.sln ctaocrypt.vcproj + +--- a/ctaocrypt/Makefile.in ++++ b/ctaocrypt/Makefile.in +@@ -174,7 +174,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src test benchmark ++SUBDIRS = src + EXTRA_DIST = ctaocrypt.dsw ctaocrypt.dsp ctaocrypt.sln ctaocrypt.vcproj + all: all-recursive + diff --git a/libs/cyassl/patches/120-makefile_destdir.patch b/libs/cyassl/patches/120-makefile_destdir.patch new file mode 100644 index 0000000000..29b0d0a05e --- /dev/null +++ b/libs/cyassl/patches/120-makefile_destdir.patch @@ -0,0 +1,49 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,14 +8,11 @@ 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 ../ + + install: +- mkdir ${prefix}/cyassl; \ +- mkdir ${prefix}/cyassl/include; \ +- mkdir ${prefix}/cyassl/include/openssl; \ +- cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \ +- make openssl-links; \ +- mkdir ${prefix}/cyassl/lib; \ +- cp lib/*.a ${prefix}/cyassl/lib ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ ++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ ++ make openssl-links; \ ++ cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir) +--- a/Makefile.in ++++ b/Makefile.in +@@ -642,17 +642,14 @@ 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 ../ + + install: +- mkdir ${prefix}/cyassl; \ +- mkdir ${prefix}/cyassl/include; \ +- mkdir ${prefix}/cyassl/include/openssl; \ +- cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \ +- make openssl-links; \ +- mkdir ${prefix}/cyassl/lib; \ +- cp lib/*.a ${prefix}/cyassl/lib ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ ++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ ++ make openssl-links; \ ++ cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir) + # 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: