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 | 41 ++++++++++++++++++++++ .../libcryptopp-5.6.4/makefile_fix_destdir.patch | 30 ++++++++++++++++ 2 files changed, 71 insertions(+) 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 (limited to 'recipes-support/libcryptopp/libcryptopp-5.6.4') 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) -- cgit v1.2.3