From 0dcd3213ce45ffe7c461922d38f60246d882f058 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 6 Mar 2017 08:25:54 +0100 Subject: libcryptopp: update to 5.6.4 - License has changed - For target builds a versioned shared object is now created Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- .../0001-Fix-cross-compilation.patch | 39 ----------------- .../libcryptopp-5.6.3/makefile_fix_destdir.patch | 30 ------------- .../0001-Fix-cross-compilation.patch | 41 ++++++++++++++++++ .../libcryptopp-5.6.4/makefile_fix_destdir.patch | 30 +++++++++++++ recipes-support/libcryptopp/libcryptopp_5.6.3.bb | 50 ---------------------- recipes-support/libcryptopp/libcryptopp_5.6.4.bb | 48 +++++++++++++++++++++ 6 files changed, 119 insertions(+), 119 deletions(-) delete mode 100644 recipes-support/libcryptopp/libcryptopp-5.6.3/0001-Fix-cross-compilation.patch delete mode 100644 recipes-support/libcryptopp/libcryptopp-5.6.3/makefile_fix_destdir.patch create mode 100644 recipes-support/libcryptopp/libcryptopp-5.6.4/0001-Fix-cross-compilation.patch create mode 100644 recipes-support/libcryptopp/libcryptopp-5.6.4/makefile_fix_destdir.patch delete mode 100644 recipes-support/libcryptopp/libcryptopp_5.6.3.bb create mode 100644 recipes-support/libcryptopp/libcryptopp_5.6.4.bb (limited to 'recipes-support') diff --git a/recipes-support/libcryptopp/libcryptopp-5.6.3/0001-Fix-cross-compilation.patch b/recipes-support/libcryptopp/libcryptopp-5.6.3/0001-Fix-cross-compilation.patch deleted file mode 100644 index d69e12d..0000000 --- a/recipes-support/libcryptopp/libcryptopp-5.6.3/0001-Fix-cross-compilation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1306eabf258f0e9ce8586b7816406a21683d529d Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler -Date: Wed, 8 Jun 2016 14:23:29 +0200 -Subject: [PATCH] Fix cross compilation - -Signed-off-by: Marcel Ziswiler ---- - GNUmakefile | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 3bc76a4..f71d990 100755 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -73,21 +73,6 @@ ifneq ($(IS_X86_64),0) - endif - endif - --# Guard use of -march=native --ifeq ($(GCC_COMPILER),0) -- CXXFLAGS += -march=native --else ifneq ($(GCC42_OR_LATER),0) -- CXXFLAGS += -march=native --else -- # GCC 3.3 and "unknown option -march=" -- # GCC 4.1 compiler crash with -march=native. -- ifneq ($(IS_X86_64),0) -- CXXFLAGS += -m64 -- else -- CXXFLAGS += -m32 -- endif # X86/X32/X64 --endif -- - # Aligned access required at -O3 for GCC due to vectorization (circa 08/2008). Expect other compilers to do the same. - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) - ifeq ($(findstring -O3,$(CXXFLAGS)),-O3) --- -2.5.5 - diff --git a/recipes-support/libcryptopp/libcryptopp-5.6.3/makefile_fix_destdir.patch b/recipes-support/libcryptopp/libcryptopp-5.6.3/makefile_fix_destdir.patch deleted file mode 100644 index 9d57fe3..0000000 --- a/recipes-support/libcryptopp/libcryptopp-5.6.3/makefile_fix_destdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nurd libcryptopp2/GNUmakefile libcryptopp/GNUmakefile ---- libcryptopp2/GNUmakefile 2013-02-20 15:30:52.000000000 +0100 -+++ libcryptopp/GNUmakefile 2013-12-01 20:58:53.774735203 +0100 -@@ -148,17 +148,17 @@ - -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS) - - install: -- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin -- -$(CP) *.h $(PREFIX)/include/cryptopp -- -$(CP) *.a $(PREFIX)/lib -- -$(CP) *.so $(PREFIX)/lib -- -$(CP) *.exe $(PREFIX)/bin -+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/bin -+ -$(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp -+ -$(CP) *.a $(DESTDIR)$(PREFIX)/lib -+ -$(CP) *.so $(DESTDIR)$(PREFIX)/lib -+ -$(CP) *.exe $(DESTDIR)$(PREFIX)/bin - - remove: -- -$(RM) -rf $(PREFIX)/include/cryptopp -- -$(RM) $(PREFIX)/lib/libcryptopp.a -- -$(RM) $(PREFIX)/lib/libcryptopp.so -- -$(RM) $(PREFIX)/bin/cryptest.exe -+ -$(RM) -rf $(DESTDIR)$(PREFIX)/include/cryptopp -+ -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.a -+ -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so -+ -$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest.exe - - libcryptopp.a: $(LIBOBJS) - $(AR) $(ARFLAGS) $@ $(LIBOBJS) diff --git a/recipes-support/libcryptopp/libcryptopp-5.6.4/0001-Fix-cross-compilation.patch b/recipes-support/libcryptopp/libcryptopp-5.6.4/0001-Fix-cross-compilation.patch new file mode 100644 index 0000000..f40c8b3 --- /dev/null +++ b/recipes-support/libcryptopp/libcryptopp-5.6.4/0001-Fix-cross-compilation.patch @@ -0,0 +1,41 @@ +From 896f33dc459a7c699a1f4061e5fcca3555e135a0 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Wed, 8 Jun 2016 14:23:29 +0200 +Subject: [PATCH] Fix cross compilation + +Signed-off-by: Marcel Ziswiler +--- + GNUmakefile | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 4de9d10..d053e94 100755 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS_MINGW)$(SUN_COMPILER),00000) + endif + endif + +-# Guard use of -march=native +-ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) +- CXXFLAGS += -march=native +-else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) +- CXXFLAGS += -march=native +-else +- # GCC 3.3 and "unknown option -march=" +- # Ubuntu GCC 4.1 compiler crash with -march=native +- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" +- # Sun compiler is handled below +- ifeq ($(SUN_COMPILER)$(IS_X64),01) +- CXXFLAGS += -m64 +- else ifeq ($(SUN_COMPILER)$(IS_X86),01) +- CXXFLAGS += -m32 +- endif # X86/X32/X64 +-endif +- + # Aligned access required for -O3 and above due to vectorization + UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) + ifneq ($(UNALIGNED_ACCESS),0) +-- +2.6.6 + diff --git a/recipes-support/libcryptopp/libcryptopp-5.6.4/makefile_fix_destdir.patch b/recipes-support/libcryptopp/libcryptopp-5.6.4/makefile_fix_destdir.patch new file mode 100644 index 0000000..9d57fe3 --- /dev/null +++ b/recipes-support/libcryptopp/libcryptopp-5.6.4/makefile_fix_destdir.patch @@ -0,0 +1,30 @@ +diff -Nurd libcryptopp2/GNUmakefile libcryptopp/GNUmakefile +--- libcryptopp2/GNUmakefile 2013-02-20 15:30:52.000000000 +0100 ++++ libcryptopp/GNUmakefile 2013-12-01 20:58:53.774735203 +0100 +@@ -148,17 +148,17 @@ + -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS) + + install: +- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin +- -$(CP) *.h $(PREFIX)/include/cryptopp +- -$(CP) *.a $(PREFIX)/lib +- -$(CP) *.so $(PREFIX)/lib +- -$(CP) *.exe $(PREFIX)/bin ++ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/bin ++ -$(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp ++ -$(CP) *.a $(DESTDIR)$(PREFIX)/lib ++ -$(CP) *.so $(DESTDIR)$(PREFIX)/lib ++ -$(CP) *.exe $(DESTDIR)$(PREFIX)/bin + + remove: +- -$(RM) -rf $(PREFIX)/include/cryptopp +- -$(RM) $(PREFIX)/lib/libcryptopp.a +- -$(RM) $(PREFIX)/lib/libcryptopp.so +- -$(RM) $(PREFIX)/bin/cryptest.exe ++ -$(RM) -rf $(DESTDIR)$(PREFIX)/include/cryptopp ++ -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.a ++ -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so ++ -$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest.exe + + libcryptopp.a: $(LIBOBJS) + $(AR) $(ARFLAGS) $@ $(LIBOBJS) diff --git a/recipes-support/libcryptopp/libcryptopp_5.6.3.bb b/recipes-support/libcryptopp/libcryptopp_5.6.3.bb deleted file mode 100644 index 9b7b67e..0000000 --- a/recipes-support/libcryptopp/libcryptopp_5.6.3.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "A free C++ class library of cryptographic schemes" -HOMEPAGE = "http://www.cryptopp.com/wiki/Main_Page" -BUGTRACKER = "http://sourceforge.net/apps/trac/cryptopp/" -SECTION = "libs" - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://License.txt;md5=48e7e415ea7fcc35278d8e7dc8e70b5d" - -BBCLASSEXTEND = "native nativesdk" - -PR = "r1" - -PVSHORT = "${@'${PV}'.replace('.','')}" -SRC_URI = " \ - https://sourceforge.net/projects/cryptopp/files/cryptopp/5.6.3/cryptopp563.zip;subdir=libcryptopp-${PV} \ - file://0001-Fix-cross-compilation.patch \ -" -SRC_URI[md5sum] = "3c5b70e2ec98b7a24988734446242d07" -SRC_URI[sha256sum] = "9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9" - -inherit autotools-brokensep pkgconfig - -PACKAGES_prepend = "${PN}-test " - -EXTRA_OECONF = "--libdir=${base_libdir}" -TARGET_CC_ARCH += "${LDFLAGS}" - -#we want tegrarcm binary to run on a 32-bit architecture, on x86_64 this requires the 32-bit compatibility libs -EXTRA_OEMAKE_class-native = "CC='${CC} -m32' CXX='${CXX} -m32'" - -do_compile() { - sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile - export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" - oe_runmake all libcryptopp.so -} - -do_install_prepend() { - export PREFIX=${D}${prefix} -} - -do_install_append() { - if [ -f "${D}/usr/lib/libcryptopp.so" ] && [ ! -e "${D}/usr/lib/libcryptopp.so.${PV}" ] - then - mv ${D}/usr/lib/libcryptopp.so ${D}/usr/lib/libcryptopp.so.${PV} - ln -fs libcryptopp.so.${PV} ${D}/usr/lib/libcryptopp.so.5 - ln -fs libcryptopp.so.${PV} ${D}/usr/lib/libcryptopp.so - fi -} - -FILES_${PN}-test = "${bindir}" diff --git a/recipes-support/libcryptopp/libcryptopp_5.6.4.bb b/recipes-support/libcryptopp/libcryptopp_5.6.4.bb new file mode 100644 index 0000000..89514e6 --- /dev/null +++ b/recipes-support/libcryptopp/libcryptopp_5.6.4.bb @@ -0,0 +1,48 @@ +SUMMARY = "A free C++ class library of cryptographic schemes" +HOMEPAGE = "http://www.cryptopp.com/wiki/Main_Page" +BUGTRACKER = "http://sourceforge.net/apps/trac/cryptopp/" +SECTION = "libs" + +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://License.txt;md5=deb6d182b0f7f8a866c42941b9f014c4" + +BBCLASSEXTEND = "native nativesdk" + +PR = "r1" + +PVSHORT = "${@'${PV}'.replace('.','')}" +SRC_URI = " \ + https://sourceforge.net/projects/cryptopp/files/cryptopp/5.6.4/cryptopp564.zip;subdir=libcryptopp-${PV} \ + file://0001-Fix-cross-compilation.patch \ +" +SRC_URI[md5sum] = "4ee7e5cdd4a45a14756c169eaf2a77fc" +SRC_URI[sha256sum] = "be430377b05c15971d5ccb6e44b4d95470f561024ed6d701fe3da3a188c84ad7" + +inherit autotools-brokensep pkgconfig + +PACKAGES_prepend = "${PN}-test " + +EXTRA_OECONF = "--libdir=${base_libdir}" +TARGET_CC_ARCH += "${LDFLAGS}" +export PREFIX="${prefix}" + +#we want tegrarcm binary to run on a 32-bit architecture, on x86_64 this requires the 32-bit compatibility libs +EXTRA_OEMAKE_class-native = "CC='${CC} -m32' CXX='${CXX} -m32'" + +do_compile() { + sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile + export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" + oe_runmake all libcryptopp.so +} + +# do not provide the shared object file, so we force to link statically for host tools +do_compile_class-native() { + sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile + export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" + oe_runmake all +} + +FILES_${PN}-test = " \ + ${bindir} \ + ${datadir}/cryptopp \ +" -- cgit v1.2.3