Bug#411063: verilog: diff for NMU version 0.8-4.2

[Steinar H. Gunderson]

tags 411063 + patch
thanks

Hi,

Attached is the diff for my verilog 0.8-4.2 NMU.

diff -u verilog-0.8/debian/changelog verilog-0.8/debian/changelog
--- verilog-0.8/debian/changelog
+++ verilog-0.8/debian/changelog
@@ -1,3 +1,11 @@
+verilog (0.8-4.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Use sysconf(_SC_PAGESIZE) instead of PAGE_SIZE macro; fixes FTBFS with
+    newer kernel headers. (Closes: #411063)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]>  Wed, 28 Feb 2007 17:16:07 +0100
+
 verilog (0.8-4.1) unstable; urgency=low
 
   * NMU as part of the GCC 4.1 transition.
only in patch2:
unchanged:
--- verilog-0.8.orig/vvp/main.cc
+++ verilog-0.8/vvp/main.cc
@@ -66,15 +66,17 @@
       {
 	    FILE *statm;
 	    unsigned siz, rss, shd;
+	    long page_size = sysconf(_SC_PAGESIZE);
+	    if (page_size==-1) page_size=0;
 	    statm = fopen("/proc/self/statm", "r");
 	    if (!statm) {
 		  perror("/proc/self/statm");
 		  return;
 	    }
 	    if (3<=fscanf(statm, "%u%u%u", &siz, &rss, &shd)) {
-		  a->ru_maxrss = PAGE_SIZE * siz;
-		  a->ru_idrss  = PAGE_SIZE * rss;
-		  a->ru_ixrss  = PAGE_SIZE * shd;
+		  a->ru_maxrss = page_size * siz;
+		  a->ru_idrss  = page_size * rss;
+		  a->ru_ixrss  = page_size * shd;
 	    }
 	    fclose(statm);
       }