[meta-security][PATCH 3/3] libewf: update to version 20140608
drop ubuntu patches, never used them.
Fix GCC 5.0 build. Signed-off-by: Armin Kuster <akuster808@...> --- recipes-forensic/libewf/files/gcc5_fix.patch | 22 ++++++++++++++++++++++ .../{libewf_20130416.bb => libewf_20140608.bb} | 4 +--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 recipes-forensic/libewf/files/gcc5_fix.patch rename recipes-forensic/libewf/{libewf_20130416.bb => libewf_20140608.bb} (78%) diff --git a/recipes-forensic/libewf/files/gcc5_fix.patch b/recipes-forensic/libewf/files/gcc5_fix.patch new file mode 100644 index 0000000..0881f25 --- /dev/null +++ b/recipes-forensic/libewf/files/gcc5_fix.patch @@ -0,0 +1,22 @@ +Upstream Status: pending + +Don't use inline with gcc 5.0 + +fixes: +undefined reference to `libuna_unicode_character_size_to_utf8' + +Signed-off-by: Armin Kuster <akuster808@...> + +Index: libuna/libuna_inline.h +=================================================================== +--- a/libuna/libuna_inline.h ++++ b/libuna/libuna_inline.h +@@ -27,7 +27,7 @@ + #if defined( _MSC_VER ) + #define LIBUNA_INLINE _inline + +-#elif defined( __BORLANDC__ ) || defined( __clang__ ) ++#elif defined( __BORLANDC__ ) || defined( __clang__ ) || ( __GNUC__ > 4 ) + #define LIBUNA_INLINE /* inline */ + + #else diff --git a/recipes-forensic/libewf/libewf_20130416.bb b/recipes-forensic/libewf/libewf_20140608.bb similarity index 78% rename from recipes-forensic/libewf/libewf_20130416.bb rename to recipes-forensic/libewf/libewf_20140608.bb index c070b80..98ebcce 100644 --- a/recipes-forensic/libewf/libewf_20130416.bb +++ b/recipes-forensic/libewf/libewf_20140608.bb @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58c39b26c0549f8e1bb4122173f474cd" DEPENDS = "virtual/gettext libtool" SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/libe/${BPN}/${BPN}_${PV}.orig.tar.gz;name=orig \ - http://archive.ubuntu.com/ubuntu/pool/universe/libe/${BPN}/${BPN}_${PV}-3.debian.tar.gz;name=dpatch \ + file://gcc5_fix.patch \ " SRC_URI[orig.md5sum] = "3791d6de5910a0f6b4427cdf1e6bc663" SRC_URI[orig.sha256sum] = "e0f14071665b24a8077a24f4cafbf092ad5ac1859f49994dc4e843e747ba7a89" -SRC_URI[dpatch.md5sum] = "57fb17b34344f741b52dff3ae11fbbd6" -SRC_URI[dpatch.sha256sum] = "988ee0a94f01d452cd227ed5c55401e7674dc6fa41da8358a6ad68e67175a5cc" inherit autotools-brokensep pkgconfig -- 2.3.5
|
|