Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

glibc: version bumped to 2.16.

For testing purposes. On my systems work both on 32 and 64 bits.
  • Loading branch information...
commit 38cbd43b3fae61b20e1a40262e3c62612045819a 1 parent f7fc638
Florin Braescu Florin65 authored
82 libs/glibc/BUILD
... ... @@ -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 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 &&
  6 +# sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
  7 + mkdir -p $SOURCE_DIRECTORY/tmp &&
8 8
9   - export CC_OPTS=( Pipe ) &&
  9 + export CC_OPTS=( Pipe ) &&
10 10
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 &&
  11 + KVER=`installed_version kernel-headers` &&
16 12
17 13 # There is no other option but nptl
18   - OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
  14 + OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
19 15
20 16 if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
21 17 sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
22   - fi &&
  18 + fi &&
23 19
24   - export CC=gcc &&
  20 + export CC=gcc &&
25 21
26 22 # Don't fully strip libc
27 23 if [[ "$LDFLAGS" == *-s* ]] ; then
28 24 STRIP=y
29   - fi &&
30   - unset LDFLAGS &&
  25 + fi &&
  26 + unset LDFLAGS &&
31 27
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 &&
  28 + patch_it $SOURCE2 1 &&
  29 + patch_it $SOURCE3 1 &&
  30 + patch_it $SOURCE4 1 &&
37 31
38 32 # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
39   - patch_it $SOURCE7 1 &&
  33 +# patch_it $SOURCE5 1 &&
  34 +
  35 +# disable final test
  36 + sed -i '/test-installation.pl/d' Makefile &&
40 37
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 &&
  38 + sedit 's/^# \(.* := rpcinfo\)/\1/p' sunrpc/Makefile &&
  39 + sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile &&
  40 + sedit '/libnss_test1/d' shlib-versions &&
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,11 +52,14 @@
55 52 --without-gd \
56 53 --without-cvs \
57 54 --enable-shared \
  55 + --enable-obsolete-rpc \
58 56 --disable-multi-arch \
59   - $OPTS &&
  57 + --enable-bind-now \
  58 + --enable-stackguard-randomization \
  59 + $OPTS &&
60 60
61 61 # explicitly exit here since the following code unsets $?
62   - make || exit 1 &&
  62 + make || exit 1 &&
63 63
64 64 # Preserve the old glibc temporarily
65 65 LD=/lib/ld-linux.so.2 &&
@@ -86,7 +86,7 @@
86 86 *)
87 87 DL=/lib/libdl.so.2
88 88 ;;
89   - esac &&
  89 + esac &&
90 90
91 91 cp $LD /lib/ld-lunar.so &&
92 92 cp $GLIBC /lib/libc-lunar.so &&
@@ -122,12 +122,12 @@
122 122
123 123 # Now optionally perform debug symbol stripping only
124 124 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 \
  125 + for FN in ld-$MAJOR.so \
  126 + lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
  127 + libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.so \
128 128 lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
129 129 strip -S /lib/$FN
130   - done &&
  130 + done &&
131 131 for FN in "/usr/lib/gconv/*.so" ; do
132 132 strip -S $FN
133 133 done
@@ -147,16 +147,16 @@
147 147 if [ -z "$GLIBC_LOCALES" ]; then
148 148 make localedata/install-locales || exit 1
149 149 else
150   - devoke_installwatch &&
  150 + devoke_installwatch &&
151 151 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" &&
  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" &&
157 157 localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
158 158 done
159   - invoke_installwatch &&
  159 + invoke_installwatch &&
160 160 touch /usr/lib/locale/locale-archive
161 161 fi
162 162
83 libs/glibc/BUILD.x86_64
... ... @@ -1,52 +1,52 @@
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 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 &&
  6 +# sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl &&
  7 + mkdir -p $SOURCE_DIRECTORY/tmp &&
8 8
9   - export CC_OPTS=( Pipe ) &&
  9 + export CC_OPTS=( Pipe ) &&
10 10
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 &&
  11 + KVER=`installed_version kernel-headers` &&
16 12
17 13 # There is no other option but nptl
18   - OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
  14 + OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER" &&
19 15
20 16 if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
21 17 sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
22   - fi &&
  18 + fi &&
23 19
24   - export CC=gcc &&
  20 + export CC=gcc &&
25 21
26 22 # Don't fully strip libc
27 23 if [[ "$LDFLAGS" == *-s* ]] ; then
28 24 STRIP=y
29   - fi &&
30   - unset LDFLAGS &&
  25 + fi &&
  26 + unset LDFLAGS &&
31 27
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 &&
  28 +# fix the compile for x86_64
  29 + 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 &&
  30 +
  31 + patch_it $SOURCE2 1 &&
  32 + patch_it $SOURCE3 1 &&
  33 + patch_it $SOURCE4 1 &&
37 34
38 35 # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
39   - patch_it $SOURCE7 1 &&
  36 +# patch_it $SOURCE5 1 &&
  37 +
  38 +# disable final test
  39 + sed -i '/test-installation.pl/d' Makefile &&
40 40
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 &&
  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 &&
44 44
45   - INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
46   - mkdir -p $INSTALL_ROOT &&
47   - cd $INSTALL_ROOT &&
  45 + INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot &&
  46 + mkdir -p $INSTALL_ROOT &&
  47 + cd $INSTALL_ROOT &&
48 48
49   - OPTS+=" --with-headers=/usr/include" &&
  49 + OPTS+=" --with-headers=/usr/include" &&
50 50
51 51 ../configure --prefix=/usr \
52 52 --infodir=/usr/share/info \
@@ -55,13 +55,16 @@
55 55 --without-gd \
56 56 --without-cvs \
57 57 --enable-shared \
  58 + --enable-obsolete-rpc \
58 59 --host=$BUILD \
59 60 --build=$BUILD \
60 61 --disable-multi-arch \
61   - $OPTS &&
  62 + --enable-bind-now \
  63 + --enable-stackguard-randomization \
  64 + $OPTS &&
62 65
63 66 # explicitly exit here since the following code unsets $?
64   - make || exit 1 &&
  67 + make || exit 1 &&
65 68
66 69 # Preserve the old glibc temporarily
67 70 LD=/lib/ld-linux-x86-64.so.2 &&
@@ -111,12 +114,12 @@
111 114
112 115 # Now optionally perform debug symbol stripping only
113 116 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 \
  117 + for FN in ld-$MAJOR.so \
  118 + lib{anl,BrokenLocale,c,crypt,dl,m,nsl,util,pthread,resolv}-$MAJOR.so \
  119 + libnss_{compat,files,hesiod,nis,nisplus}-$MAJOR.so \
117 120 lib{memusage,pcprofile,SegFault,thread_db-1.0}.so ; do
118 121 strip -S /lib/$FN
119   - done &&
  122 + done &&
120 123 for FN in "/usr/lib/gconv/*.so" ; do
121 124 strip -S $FN
122 125 done
@@ -136,16 +139,16 @@
136 139 if [ -z "$GLIBC_LOCALES" ]; then
137 140 make localedata/install-locales || exit 1
138 141 else
139   - devoke_installwatch &&
  142 + devoke_installwatch &&
140 143 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" &&
  144 + INPUTFILE=$(echo $LOCALE | cut -d/ -f1 | sed -e 's:\..*$::g') &&
  145 + OUTPUTFILE=$(echo $LOCALE | cut -d/ -f1) &&
  146 + CHARMAP=$(echo $LOCALE | cut -d/ -f2) &&
  147 + mkdir -p /usr/lib/locale/$OUTPUTFILE &&
  148 + echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE" &&
146 149 localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
147 150 done
148   - invoke_installwatch &&
  151 + invoke_installwatch &&
149 152 touch /usr/lib/locale/locale-archive
150 153 fi
151 154
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() {
23 libs/glibc/DETAILS
... ... @@ -1,12 +1,11 @@
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.14.1-fixes-1.patch.bz2
10 9 SOURCE_URL[0]=$GNU_URL/$MODULE
11 10 SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
12 11 SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/glibc
@@ -14,18 +13,14 @@
14 13 SOURCE3_URL=$PATCH_URL
15 14 SOURCE4_URL=$PATCH_URL
16 15 SOURCE5_URL=$PATCH_URL
17   - SOURCE6_URL=$PATCH_URL
18   - SOURCE7_URL=http://www.linuxfromscratch.org/patches/lfs/7.0
19   - SOURCE_VFY=sha1:f1945eea78bb30563d33c9e6a5f6f97f374135b4
  16 + SOURCE_VFY=sha1:9d4fffc9c4ac93e7919e124fa38bb51dcaff5216
20 17 SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
21 18 SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
22   - SOURCE4_VFY=sha1:2fa2f8b8920c5009a864cc0b0ec5fcccee4c84a5
23   - SOURCE5_VFY=sha1:4f22e3bd256652e21d6208666fef815021c1ecab
24   - SOURCE6_VFY=sha1:268509d8df9aa802747b84c4e46925fb65f30737
25   - SOURCE7_VFY=sha1:cc8fe170befc0a1fe56d6c18da1afc73c8c72b1b
  19 + SOURCE4_VFY=sha1:7e53ec5daaf29d13ff3e9a9b2450da1f93000add
  20 + SOURCE5_VFY=sha1:5e26fb8800dd974527b4b73443ddfe134beae7f9
26 21 WEB_SITE=http://www.gnu.org/software/libc
27 22 ENTERED=20010922
28   - UPDATED=20111114
  23 + UPDATED=20120712
29 24 SHORT="C library for use with GNU/Hurd and GNU/Linux"
30 25 PSAFE=no
31 26

0 comments on commit 38cbd43

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