Hello community, here is the log from the commit of package bulk_extractor for openSUSE:Factory checked in at 2012-09-10 15:23:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bulk_extractor (Old) and /work/SRC/openSUSE:Factory/.bulk_extractor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bulk_extractor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/bulk_extractor/bulk_extractor.changes 2012-04-23 16:09:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bulk_extractor.new/bulk_extractor.changes 2012-09-10 15:28:49.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 16 20:10:26 UTC 2012 - [email protected] + +- fix compilation on non-x86 hosts + * cpuid.patch + +------------------------------------------------------------------- New: ---- cpuid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bulk_extractor.spec ++++++ --- /var/tmp/diff_new_pack.22WFvv/_old 2012-09-10 15:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.22WFvv/_new 2012-09-10 15:28:50.000000000 +0200 @@ -16,25 +16,24 @@ # - Name: bulk_extractor Version: 1.2.0 Release: 0 -License: GPL-3.0+ Summary: Bulk Email and URL extraction tool -Url: http://afflib.org +License: GPL-3.0+ Group: Productivity/File utilities -AutoReqProv: on +Url: http://afflib.org # Source: bulk_extractor-%%{version}.tar.gz Source: http://afflib.org/downloads/bulk_extractor-%{version}.tar.gz -BuildRequires: libtsk3-3 -BuildRequires: zlib-devel -BuildRequires: openssl-devel -BuildRequires: libewf-devel +Patch1: cpuid.patch BuildRequires: afflib-devel -BuildRequires: libexiv2-devel -BuildRequires: gcc-c++ BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: libewf-devel +BuildRequires: libexiv2-devel +BuildRequires: libtsk3-3 +BuildRequires: openssl-devel +BuildRequires: zlib-devel %description bulk_extractor is a C++ program that scans a disk image, a file, or a @@ -46,6 +45,7 @@ %prep %setup -q +%patch1 -p1 %build %configure ++++++ cpuid.patch ++++++ Index: bulk_extractor-1.2.0/src/xml.cpp =================================================================== --- bulk_extractor-1.2.0.orig/src/xml.cpp +++ bulk_extractor-1.2.0/src/xml.cpp @@ -440,6 +440,7 @@ void xml::pop() void xml::cpuid(uint32_t op, unsigned long *eax, unsigned long *ebx, unsigned long *ecx, unsigned long *edx) { +#ifdef HAVE_ASM_CPUID #if defined(__i386__) && defined(__PIC__) __asm__ __volatile__("pushl %%ebx \n\t" /* save %ebx */ "cpuid \n\t" @@ -455,6 +456,7 @@ void xml::cpuid(uint32_t op, unsigned lo : "cc"); #endif +#endif } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
