Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #75 from Ratler/glibc-2.16

Glibc 2.16
  • Loading branch information...
commit d35adabc2fc6e2828138b48fc3533e35664a6fa4 2 parents 4d0401e + 045b95f
Stefan Wold authored October 07, 2012
85  libs/glibc/BUILD
... ...
@@ -1,52 +1,46 @@
1 1
 (
2 2
   # The fortify compiler option cause the build to fail
3  
-  bad_flags -D_FORTIFY_SOURCE=2 &&
  3
+  bad_flags -D_FORTIFY_SOURCE=2  &&
4 4
 
5  
-# This sedit takes care of Bug Report 398 submitted by Striker.
6  
-  sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
7  
-  mkdir -p $SOURCE_DIRECTORY/tmp &&
  5
+  mkdir -p $SOURCE_DIRECTORY/tmp  &&
8 6
 
9  
-  export CC_OPTS=( Pipe ) &&
  7
+  export CC_OPTS=( Pipe )  &&
10 8
 
11  
-  if module_installed kernel-headers; then
12  
-  KVER=`installed_version kernel-headers`
13  
-  else
14  
-  KVER=`installed_version kernel-headers-2.6`
15  
-  fi &&
  9
+  KVER=`installed_version kernel-headers`  &&
16 10
 
17 11
   # There is no other option but nptl
18  
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
  12
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER"  &&
19 13
 
20 14
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
21 15
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
22  
-  fi &&
  16
+  fi  &&
23 17
 
24  
-  export CC=gcc &&
  18
+  export CC=gcc  &&
25 19
 
26 20
   # Don't fully strip libc
27 21
   if [[ "$LDFLAGS" == *-s* ]] ; then
28 22
     STRIP=y
29  
-  fi &&
30  
-  unset LDFLAGS &&
31  
-
32  
-  patch_it $SOURCE2 1 &&
33  
-  patch_it $SOURCE3 1 &&
34  
-  patch_it $SOURCE4 1 &&
35  
-  patch_it $SOURCE5 1 &&
36  
-  patch_it $SOURCE6 1 &&
  23
+  fi  &&
  24
+  unset LDFLAGS  &&
37 25
 
38  
-  # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
39  
-  patch_it $SOURCE7 1 &&
  26
+  patch_it $SOURCE2 1  &&
  27
+  patch_it $SOURCE3 1  &&
  28
+  patch_it $SOURCE4 1  &&
  29
+  
  30
+  # Fix res_query assertion
  31
+  patch_it $SOURCE5 1  &&
  32
+  
  33
+  # Fix various hangs
  34
+  patch_it $SOURCE6 1  &&
40 35
 
41  
-  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile &&
42  
-  sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
43  
-  sedit '/libnss_test1/d' shlib-versions &&
  36
+  # disable final test
  37
+  sed -i '/test-installation.pl/d' Makefile  &&
44 38
 
45  
-  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
46  
-  mkdir -p $INSTALL_ROOT &&
47  
-  cd $INSTALL_ROOT &&
  39
+  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
  40
+  mkdir -p $INSTALL_ROOT  &&
  41
+  cd $INSTALL_ROOT  &&
48 42
 
49  
-  OPTS+=" --with-headers=/usr/include" &&
  43
+  OPTS+=" --with-headers=/usr/include"  &&
50 44
 
51 45
   ../configure --prefix=/usr              \
52 46
                --infodir=/usr/share/info  \
@@ -55,11 +49,14 @@
55 49
                --without-gd               \
56 50
                --without-cvs              \
57 51
                --enable-shared            \
  52
+               --enable-obsolete-rpc      \
58 53
                --disable-multi-arch       \
59  
-               $OPTS                     &&
  54
+               --enable-bind-now          \
  55
+               --enable-stackguard-randomization \
  56
+               $OPTS  &&
60 57
 
61 58
   # explicitly exit here since the following code unsets $?
62  
-  make || exit 1 &&
  59
+  make || exit 1  &&
63 60
 
64 61
   # Preserve the old glibc temporarily
65 62
   LD=/lib/ld-linux.so.2         &&
@@ -86,7 +83,7 @@
86 83
      *)
87 84
           DL=/lib/libdl.so.2
88 85
           ;;
89  
-  esac &&
  86
+  esac  &&
90 87
 
91 88
   cp $LD /lib/ld-lunar.so               &&
92 89
   cp $GLIBC /lib/libc-lunar.so          &&
@@ -122,12 +119,12 @@
122 119
 
123 120
   # Now optionally perform debug symbol stripping only
124 121
   if [ "$STRIP" == "y" ] ; then
125  
-    for FN in ld-$VERSION.so \
126  
-        lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$VERSION.so \
127  
-        libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
  122
+    for FN in ld-$MAJOR.so \
  123
+        lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
  124
+        libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.so \
128 125
         lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
129 126
       strip -S /lib/$FN
130  
-    done &&
  127
+    done  &&
131 128
     for FN in "/usr/lib/gconv/*.so" ; do
132 129
       strip -S $FN
133 130
     done
@@ -147,16 +144,16 @@
147 144
   if [ -z "$GLIBC_LOCALES" ]; then
148 145
     make localedata/install-locales || exit 1
149 146
   else
150  
-    devoke_installwatch &&
  147
+    devoke_installwatch  &&
151 148
     for LOCALE in $GLIBC_LOCALES; do
152  
-      INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g') &&
153  
-      OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1) &&
154  
-      CHARMAP=$(echo  $LOCALE | cut -d/ -f2) &&
155  
-      mkdir -p /usr/lib/locale/$OUTPUTFILE &&
156  
-      echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE" &&
  149
+      INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g')  &&
  150
+      OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1)  &&
  151
+      CHARMAP=$(echo  $LOCALE | cut -d/ -f2)    &&
  152
+      mkdir -p /usr/lib/locale/$OUTPUTFILE      &&
  153
+      echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"  &&
157 154
       localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
158 155
     done
159  
-    invoke_installwatch &&
  156
+    invoke_installwatch  &&
160 157
     touch /usr/lib/locale/locale-archive
161 158
   fi
162 159
 
84  libs/glibc/BUILD.x86_64
... ...
@@ -1,52 +1,49 @@
1 1
 (
2 2
   # The fortify compiler option cause the build to fail
3  
-  bad_flags -D_FORTIFY_SOURCE=2 &&
  3
+  bad_flags -D_FORTIFY_SOURCE=2  &&
4 4
 
5  
-# This sedit takes care of Bug Report 398 submitted by Striker.
6  
-  sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
7  
-  mkdir -p $SOURCE_DIRECTORY/tmp &&
  5
+  mkdir -p $SOURCE_DIRECTORY/tmp  &&
8 6
 
9  
-  export CC_OPTS=( Pipe ) &&
  7
+  export CC_OPTS=( Pipe )  &&
10 8
 
11  
-  if module_installed kernel-headers; then
12  
-  KVER=`installed_version kernel-headers`
13  
-  else
14  
-  KVER=`installed_version kernel-headers-2.6`
15  
-  fi &&
  9
+  KVER=`installed_version kernel-headers`  &&
16 10
 
17 11
   # There is no other option but nptl
18  
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
  12
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER"  &&
19 13
 
20 14
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
21 15
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
22  
-  fi &&
  16
+  fi  &&
23 17
 
24  
-  export CC=gcc &&
  18
+  export CC=gcc  &&
25 19
 
26 20
   # Don't fully strip libc
27 21
   if [[ "$LDFLAGS" == *-s* ]] ; then
28 22
     STRIP=y
29  
-  fi &&
30  
-  unset LDFLAGS &&
  23
+  fi  &&
  24
+  unset LDFLAGS  &&
  25
+
  26
+  # fix the compile for x86_64
  27
+  sedit "s:s_floor-c s_ceil-c s_floorf-c s_ceilf-c:s_floorf-c s_ceilf-c:g"  sysdeps/x86_64/fpu/multiarch/Makefile  &&
31 28
 
32  
-  patch_it $SOURCE2 1 &&
33  
-  patch_it $SOURCE3 1 &&
34  
-  patch_it $SOURCE4 1 &&
35  
-  patch_it $SOURCE5 1 &&
36  
-  patch_it $SOURCE6 1 &&
  29
+  patch_it $SOURCE2 1  &&
  30
+  patch_it $SOURCE3 1  &&
  31
+  patch_it $SOURCE4 1  &&
37 32
 
38  
-  # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
39  
-  patch_it $SOURCE7 1 &&
  33
+  # Fix res_query assertion
  34
+  patch_it $SOURCE5 1  &&
  35
+  
  36
+  # Fix various hangs
  37
+  patch_it $SOURCE6 1  &&
40 38
 
41  
-  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile &&
42  
-  sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
43  
-  sedit '/libnss_test1/d' shlib-versions &&
  39
+  # disable final test
  40
+  sed -i '/test-installation.pl/d' Makefile  &&
44 41
 
45  
-  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
46  
-  mkdir -p $INSTALL_ROOT &&
47  
-  cd $INSTALL_ROOT &&
  42
+  INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
  43
+  mkdir -p $INSTALL_ROOT  &&
  44
+  cd $INSTALL_ROOT  &&
48 45
 
49  
-  OPTS+=" --with-headers=/usr/include" &&
  46
+  OPTS+=" --with-headers=/usr/include"  &&
50 47
 
51 48
   ../configure --prefix=/usr              \
52 49
                --infodir=/usr/share/info  \
@@ -55,13 +52,16 @@
55 52
                --without-gd               \
56 53
                --without-cvs              \
57 54
                --enable-shared            \
  55
+               --enable-obsolete-rpc      \
58 56
                --host=$BUILD              \
59 57
                --build=$BUILD             \
60 58
                --disable-multi-arch       \
61  
-               $OPTS                     &&
  59
+               --enable-bind-now          \
  60
+               --enable-stackguard-randomization \
  61
+               $OPTS  &&
62 62
 
63 63
   # explicitly exit here since the following code unsets $?
64  
-  make || exit 1 &&
  64
+  make || exit 1  &&
65 65
 
66 66
   # Preserve the old glibc temporarily
67 67
   LD=/lib/ld-linux-x86-64.so.2  &&
@@ -111,12 +111,12 @@
111 111
 
112 112
   # Now optionally perform debug symbol stripping only
113 113
   if [ "$STRIP" == "y" ] ; then
114  
-    for FN in ld-$VERSION.so \
115  
-        lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$VERSION.so \
116  
-        libnss_{compat,files,hesiod,nis,nisplus}-$VERSION.so \
  114
+    for FN in ld-$MAJOR.so \
  115
+        lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
  116
+        libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.so \
117 117
         lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
118 118
       strip -S /lib/$FN
119  
-    done &&
  119
+    done  &&
120 120
     for FN in "/usr/lib/gconv/*.so" ; do
121 121
       strip -S $FN
122 122
     done
@@ -136,16 +136,16 @@
136 136
   if [ -z "$GLIBC_LOCALES" ]; then
137 137
     make localedata/install-locales || exit 1
138 138
   else
139  
-    devoke_installwatch &&
  139
+    devoke_installwatch  &&
140 140
     for LOCALE in $GLIBC_LOCALES; do
141  
-      INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g') &&
142  
-      OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1) &&
143  
-      CHARMAP=$(echo  $LOCALE | cut -d/ -f2) &&
144  
-      mkdir -p /usr/lib/locale/$OUTPUTFILE &&
145  
-      echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE" &&
  141
+      INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g')  &&
  142
+      OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1)  &&
  143
+      CHARMAP=$(echo  $LOCALE | cut -d/ -f2)    &&
  144
+      mkdir -p /usr/lib/locale/$OUTPUTFILE      &&
  145
+      echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"  &&
146 146
       localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
147 147
     done
148  
-    invoke_installwatch &&
  148
+    invoke_installwatch  &&
149 149
     touch /usr/lib/locale/locale-archive
150 150
   fi
151 151
 
4  libs/glibc/CONFIGURE
@@ -9,7 +9,7 @@ FILELIST_FILE="$LOCALEDATA_DIR-files"
9 9
 
10 10
 unpack_localedata() {
11 11
   # Write the path of the localedata archive path into a file
12  
-  echo "${SOURCE/.tar.bz2/}/localedata" > $FILELIST_FILE &&
  12
+  echo "${SOURCE/.tar.xz/}/localedata" > $FILELIST_FILE &&
13 13
 
14 14
   message "Extracting locale data .. this might take a second .."
15 15
 
@@ -17,7 +17,7 @@ unpack_localedata() {
17 17
   tar -C /tmp               \
18 18
       -T $FILELIST_FILE     \
19 19
       --strip-components=1  \
20  
-      -xjf $SOURCE_CACHE/$SOURCE
  20
+      -xJf $SOURCE_CACHE/$SOURCE
21 21
 }
22 22
 
23 23
 remove_temporary_files() {
24  libs/glibc/DETAILS
... ...
@@ -1,12 +1,12 @@
1 1
           MODULE=glibc
2  
-         VERSION=2.14.1
3  
-          SOURCE=$MODULE-$VERSION.tar.bz2
  2
+           MAJOR=2.16
  3
+         VERSION=$MAJOR.0
  4
+          SOURCE=$MODULE-$VERSION.tar.xz
4 5
          SOURCE2=$MODULE-2.11-no_timezones.patch.bz2
5 6
          SOURCE3=$MODULE-2.11.1-__i686.patch.bz2
6  
-         SOURCE4=$MODULE-2.13-gcc_fix-1.patch.bz2
7  
-         SOURCE5=$MODULE-2.14.1-nss_test1.patch.bz2
8  
-         SOURCE6=$MODULE-2.14.1-rpc-restore.patch.bz2
9  
-         SOURCE7=$MODULE-2.14.1-fixes-1.patch
  7
+         SOURCE4=$MODULE-2.15-fixes-1.patch.bz2
  8
+         SOURCE5=$MODULE-2.15-fix-res_query-assert.patch
  9
+         SOURCE6=$MODULE-2.15-revert-c5a0802a.patch
10 10
    SOURCE_URL[0]=$GNU_URL/$MODULE
11 11
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
12 12
    SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/glibc
@@ -15,17 +15,15 @@
15 15
      SOURCE4_URL=$PATCH_URL
16 16
      SOURCE5_URL=$PATCH_URL
17 17
      SOURCE6_URL=$PATCH_URL
18  
-     SOURCE7_URL=http://www.linuxfromscratch.org/patches/lfs/7.0
19  
-      SOURCE_VFY=sha1:f1945eea78bb30563d33c9e6a5f6f97f374135b4
  18
+      SOURCE_VFY=sha1:9d4fffc9c4ac93e7919e124fa38bb51dcaff5216
20 19
      SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
21 20
      SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
22  
-     SOURCE4_VFY=sha1:2fa2f8b8920c5009a864cc0b0ec5fcccee4c84a5
23  
-     SOURCE5_VFY=sha1:4f22e3bd256652e21d6208666fef815021c1ecab
24  
-     SOURCE6_VFY=sha1:268509d8df9aa802747b84c4e46925fb65f30737
25  
-     SOURCE7_VFY=sha1:cc8fe170befc0a1fe56d6c18da1afc73c8c72b1b
  21
+     SOURCE4_VFY=sha1:7e53ec5daaf29d13ff3e9a9b2450da1f93000add
  22
+     SOURCE5_VFY=sha1:fa4f4ce87a08f40d70f4d88d1ee62cf63b644bcc
  23
+     SOURCE6_VFY=sha1:aad4d183fc2509e87f0986802117a45772cc0a0c
26 24
         WEB_SITE=http://www.gnu.org/software/libc
27 25
          ENTERED=20010922
28  
-         UPDATED=20111114
  26
+         UPDATED=20120712
29 27
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
30 28
            PSAFE=no
31 29
 

0 notes on commit d35adab

Please sign in to comment.
Something went wrong with that request. Please try again.