[Forensics-changes] [SCM] debian-forensics/libphash branch, debian, updated. debian/0.9.0-1-5-ga5e5573

Tiago Bortoletto Vaz tiago at debian-ba.org
Sat May 15 03:42:17 UTC 2010


The following commit has been merged in the debian branch:
commit ada32459abd8c76979bc2b8591c8274926154f70
Author: Tiago Bortoletto Vaz <tiago at debian-ba.org>
Date:   Sat May 15 03:11:14 2010 +0000

    add patch

diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..707604e
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_build_on_kfreebsd
diff --git a/debian/patches/01_build_on_kfreebsd.dpatch b/debian/patches/01_build_on_kfreebsd.dpatch
new file mode 100755
index 0000000..5831c4d
--- /dev/null
+++ b/debian/patches/01_build_on_kfreebsd.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_build_on_kfreebsd.dpatch by  <tiago at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libphash~/src/pHash.cpp libphash/src/pHash.cpp
+--- libphash~/src/pHash.cpp	2010-03-28 18:23:01.000000000 +0000
++++ libphash/src/pHash.cpp	2010-05-15 03:06:57.000000000 +0000
+@@ -34,7 +34,7 @@
+ int ph_num_threads()
+ {
+ 	int numCPU = 1;
+-	#ifdef linux
++	#ifdef __GLIBC__
+ 		numCPU = sysconf( _SC_NPROCESSORS_ONLN );
+ 	#else
+ 		nt mib[4];
+@@ -1098,7 +1098,7 @@
+ 	m->branchfactor = 2;
+     	m->pathlength = 5;
+     	m->leafcapacity = 23;
+-    	#ifdef linux
++	#ifdef __GLIBC__
+ 		m->pgsize = sysconf(_SC_PAGE_SIZE);
+ 	#else
+ 		m->pgsize = getpagesize();

-- 
debian-forensics/libphash



More information about the forensics-changes mailing list