patches/glibc/2.7/250-sh-chop-linux-version.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
yann@962
     1
--- glibc-2.7/sysdeps/unix/sysv/linux/dl-osinfo.h.orig	2007-09-15 23:54:08.000000000 +0100
yann@962
     2
+++ glibc-2.7/sysdeps/unix/sysv/linux/dl-osinfo.h	2008-08-20 09:26:26.000000000 +0100
yann@962
     3
@@ -83,6 +83,10 @@
yann@962
     4
   int parts;
yann@962
     5
   char *cp;
yann@962
     6
   struct utsname uts;
yann@962
     7
+  int dotsfound = 0;
yann@962
     8
+  int versionindex = 0;
yann@962
     9
+  char *choppoint;
yann@962
    10
+
yann@962
    11
 
yann@962
    12
   /* Try the uname system call.  */
yann@962
    13
   if (__uname (&uts))
yann@962
    14
@@ -102,8 +106,34 @@
yann@962
    15
   else
yann@962
    16
     buf = uts.release;
yann@962
    17
 
yann@962
    18
+  /* We are only interested in the first three kernel numbers, so */
yann@962
    19
+  /* chop off anything past that: */
yann@962
    20
+
yann@962
    21
+  choppoint = buf;
yann@962
    22
+  while (1)
yann@962
    23
+    {
yann@962
    24
+      versionindex++;
yann@962
    25
+      if (versionindex == 63) break;
yann@962
    26
+      if (*choppoint == '.') dotsfound++;
yann@962
    27
+      choppoint++;
yann@962
    28
+      if (dotsfound == 2)
yann@962
    29
+      {
yann@962
    30
+        if (*choppoint == '0' || *choppoint == '1'
yann@962
    31
+          || *choppoint == '2' || *choppoint == '3'
yann@962
    32
+          || *choppoint == '4' || *choppoint == '5'
yann@962
    33
+          || *choppoint == '6' || *choppoint == '7'
yann@962
    34
+          || *choppoint == '8' || *choppoint == '9')
yann@962
    35
+          continue;
yann@962
    36
+        else
yann@962
    37
+          {
yann@962
    38
+            *choppoint = 0;
yann@962
    39
+            break;
yann@962
    40
+          }
yann@962
    41
+      }
yann@962
    42
+    }
yann@962
    43
+
yann@962
    44
   /* Now convert it into a number.  The string consists of at most
yann@962
    45
-     three parts.  */
yann@962
    46
+     three parts.  Now it does, anyway.  ;-)  */
yann@962
    47
   version = 0;
yann@962
    48
   parts = 0;
yann@962
    49
   cp = buf;