CRUX-ARM : Home

Home :: Documentation :: Download :: Development :: Community :: Ports :: Packages :: Bugs :: Links :: About :: Donors
development / crossrootfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 396d340)
glibc: initial import (verified compilation)
authorVictor Martinez <pitillo@ono.com>
Thu, 13 Oct 2011 11:40:43 +0000 (11:40 +0000)
committerVictor Martinez <pitillo@ono.com>
Thu, 13 Oct 2011 11:40:43 +0000 (11:40 +0000)
glibc/.footprint patch | blob | blame | history
glibc/.md5sum patch | blob | blame | history
glibc/Pkgfile patch | blob | blame | history
glibc/glibc-2.13-cross_hacks-2.patch [moved from glibc/glibc-2.12.2-cross_hacks-2.patch with 100% similarity] patch | blob | blame | history
glibc/glibc-2.13-gnueabihf.patch [new file with mode: 0644] patch | blob
glibc/glibc-2.13-prelink.patch [new file with mode: 0644] patch | blob

diff --git a/glibc/.footprint b/glibc/.footprint
index 936a34d8e93870dc05b7d901305d7ed46fc787c2..26d3a371ab29ab2971b88b1ca68d259711d8e721 100644 (file)
--- a/glibc/.footprint
+++ b/glibc/.footprint
@@ -8,49 +8,49 @@ lrwxrwxrwx    root/root       etc/localtime -> ../usr/share/zoneinfo/UTC
 -rw-r--r--     root/root       etc/resolv.conf
 -rw-r--r--     root/root       etc/rpc
 drwxr-xr-x     root/root       lib/
 -rw-r--r--     root/root       etc/resolv.conf
 -rw-r--r--     root/root       etc/rpc
 drwxr-xr-x     root/root       lib/
--rwxr-xr-x     root/root       lib/ld-2.12.2.so
-lrwxrwxrwx     root/root       lib/ld-linux.so.3 -> ld-2.12.2.so
--rwxr-xr-x     root/root       lib/libBrokenLocale-2.12.2.so
-lrwxrwxrwx     root/root       lib/libBrokenLocale.so.1 -> libBrokenLocale-2.12.2.so
+-rwxr-xr-x     root/root       lib/ld-2.13.so
+lrwxrwxrwx     root/root       lib/ld-linux.so.3 -> ld-2.13.so
+-rwxr-xr-x     root/root       lib/libBrokenLocale-2.13.so
+lrwxrwxrwx     root/root       lib/libBrokenLocale.so.1 -> libBrokenLocale-2.13.so
 -rwxr-xr-x     root/root       lib/libSegFault.so
 -rwxr-xr-x     root/root       lib/libSegFault.so
--rwxr-xr-x     root/root       lib/libanl-2.12.2.so
-lrwxrwxrwx     root/root       lib/libanl.so.1 -> libanl-2.12.2.so
--rwxr-xr-x     root/root       lib/libc-2.12.2.so
-lrwxrwxrwx     root/root       lib/libc.so.6 -> libc-2.12.2.so
--rwxr-xr-x     root/root       lib/libcidn-2.12.2.so
-lrwxrwxrwx     root/root       lib/libcidn.so.1 -> libcidn-2.12.2.so
--rwxr-xr-x     root/root       lib/libcrypt-2.12.2.so
-lrwxrwxrwx     root/root       lib/libcrypt.so.1 -> libcrypt-2.12.2.so
--rwxr-xr-x     root/root       lib/libdl-2.12.2.so
-lrwxrwxrwx     root/root       lib/libdl.so.2 -> libdl-2.12.2.so
--rwxr-xr-x     root/root       lib/libm-2.12.2.so
-lrwxrwxrwx     root/root       lib/libm.so.6 -> libm-2.12.2.so
+-rwxr-xr-x     root/root       lib/libanl-2.13.so
+lrwxrwxrwx     root/root       lib/libanl.so.1 -> libanl-2.13.so
+-rwxr-xr-x     root/root       lib/libc-2.13.so
+lrwxrwxrwx     root/root       lib/libc.so.6 -> libc-2.13.so
+-rwxr-xr-x     root/root       lib/libcidn-2.13.so
+lrwxrwxrwx     root/root       lib/libcidn.so.1 -> libcidn-2.13.so
+-rwxr-xr-x     root/root       lib/libcrypt-2.13.so
+lrwxrwxrwx     root/root       lib/libcrypt.so.1 -> libcrypt-2.13.so
+-rwxr-xr-x     root/root       lib/libdl-2.13.so
+lrwxrwxrwx     root/root       lib/libdl.so.2 -> libdl-2.13.so
+-rwxr-xr-x     root/root       lib/libm-2.13.so
+lrwxrwxrwx     root/root       lib/libm.so.6 -> libm-2.13.so
 -rwxr-xr-x     root/root       lib/libmemusage.so
 -rwxr-xr-x     root/root       lib/libmemusage.so
--rwxr-xr-x     root/root       lib/libnsl-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnsl.so.1 -> libnsl-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_compat-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_compat.so.2 -> libnss_compat-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_dns-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_dns.so.2 -> libnss_dns-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_files-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_files.so.2 -> libnss_files-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_hesiod-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_hesiod.so.2 -> libnss_hesiod-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_nis-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_nis.so.2 -> libnss_nis-2.12.2.so
--rwxr-xr-x     root/root       lib/libnss_nisplus-2.12.2.so
-lrwxrwxrwx     root/root       lib/libnss_nisplus.so.2 -> libnss_nisplus-2.12.2.so
+-rwxr-xr-x     root/root       lib/libnsl-2.13.so
+lrwxrwxrwx     root/root       lib/libnsl.so.1 -> libnsl-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_compat-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_compat.so.2 -> libnss_compat-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_dns-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_dns.so.2 -> libnss_dns-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_files-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_files.so.2 -> libnss_files-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_hesiod-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_hesiod.so.2 -> libnss_hesiod-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_nis-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_nis.so.2 -> libnss_nis-2.13.so
+-rwxr-xr-x     root/root       lib/libnss_nisplus-2.13.so
+lrwxrwxrwx     root/root       lib/libnss_nisplus.so.2 -> libnss_nisplus-2.13.so
 -rwxr-xr-x     root/root       lib/libpcprofile.so
 -rwxr-xr-x     root/root       lib/libpcprofile.so
--rwxr-xr-x     root/root       lib/libpthread-2.12.2.so
-lrwxrwxrwx     root/root       lib/libpthread.so.0 -> libpthread-2.12.2.so
--rwxr-xr-x     root/root       lib/libresolv-2.12.2.so
-lrwxrwxrwx     root/root       lib/libresolv.so.2 -> libresolv-2.12.2.so
--rwxr-xr-x     root/root       lib/librt-2.12.2.so
-lrwxrwxrwx     root/root       lib/librt.so.1 -> librt-2.12.2.so
+-rwxr-xr-x     root/root       lib/libpthread-2.13.so
+lrwxrwxrwx     root/root       lib/libpthread.so.0 -> libpthread-2.13.so
+-rwxr-xr-x     root/root       lib/libresolv-2.13.so
+lrwxrwxrwx     root/root       lib/libresolv.so.2 -> libresolv-2.13.so
+-rwxr-xr-x     root/root       lib/librt-2.13.so
+lrwxrwxrwx     root/root       lib/librt.so.1 -> librt-2.13.so
 -rwxr-xr-x     root/root       lib/libthread_db-1.0.so
 lrwxrwxrwx     root/root       lib/libthread_db.so.1 -> libthread_db-1.0.so
 -rwxr-xr-x     root/root       lib/libthread_db-1.0.so
 lrwxrwxrwx     root/root       lib/libthread_db.so.1 -> libthread_db-1.0.so
--rwxr-xr-x     root/root       lib/libutil-2.12.2.so
-lrwxrwxrwx     root/root       lib/libutil.so.1 -> libutil-2.12.2.so
+-rwxr-xr-x     root/root       lib/libutil-2.13.so
+lrwxrwxrwx     root/root       lib/libutil.so.1 -> libutil-2.13.so
 drwxr-xr-x     root/root       sbin/
 -rwxr-xr-x     root/root       sbin/ldconfig
 -rwxr-xr-x     root/root       sbin/sln
 drwxr-xr-x     root/root       sbin/
 -rwxr-xr-x     root/root       sbin/ldconfig
 -rwxr-xr-x     root/root       sbin/sln
@@ -545,6 +545,7 @@ drwxr-xr-x  root/root       usr/include/linux/isdn/
 -rw-r--r--     root/root       usr/include/linux/kernelcapi.h
 -rw-r--r--     root/root       usr/include/linux/keyboard.h
 -rw-r--r--     root/root       usr/include/linux/keyctl.h
 -rw-r--r--     root/root       usr/include/linux/kernelcapi.h
 -rw-r--r--     root/root       usr/include/linux/keyboard.h
 -rw-r--r--     root/root       usr/include/linux/keyctl.h
+-rw-r--r--     root/root       usr/include/linux/l2tp.h
 -rw-r--r--     root/root       usr/include/linux/limits.h
 -rw-r--r--     root/root       usr/include/linux/llc.h
 -rw-r--r--     root/root       usr/include/linux/loop.h
 -rw-r--r--     root/root       usr/include/linux/limits.h
 -rw-r--r--     root/root       usr/include/linux/llc.h
 -rw-r--r--     root/root       usr/include/linux/loop.h
@@ -1083,6 +1084,7 @@ drwxr-xr-x        root/root       usr/include/sys/
 -rw-r--r--     root/root       usr/include/sys/epoll.h
 -rw-r--r--     root/root       usr/include/sys/errno.h
 -rw-r--r--     root/root       usr/include/sys/eventfd.h
 -rw-r--r--     root/root       usr/include/sys/epoll.h
 -rw-r--r--     root/root       usr/include/sys/errno.h
 -rw-r--r--     root/root       usr/include/sys/eventfd.h
+-rw-r--r--     root/root       usr/include/sys/fanotify.h
 -rw-r--r--     root/root       usr/include/sys/fcntl.h
 -rw-r--r--     root/root       usr/include/sys/file.h
 -rw-r--r--     root/root       usr/include/sys/fsuid.h
 -rw-r--r--     root/root       usr/include/sys/fcntl.h
 -rw-r--r--     root/root       usr/include/sys/file.h
 -rw-r--r--     root/root       usr/include/sys/fsuid.h
diff --git a/glibc/.md5sum b/glibc/.md5sum
index 05cc1b82f53dce4aaef2e9d21f897c64f0aecd1e..3f749486c3d04c2c2d33f6cf6f7856dd670aa171 100644 (file)
--- a/glibc/.md5sum
+++ b/glibc/.md5sum
@@ -1,11 +1,13 @@
 6c8b3f5c56d80eba760cc896e7462b0e  Optimize-__getpagesize-a-bit.patch
 6c8b3f5c56d80eba760cc896e7462b0e  Optimize-__getpagesize-a-bit.patch
-38d4feb7e6ea1427534c7a52442f51db  glibc-2.12.2-cross_hacks-2.patch
-e0043f4f8e1aa61acc62fdf0f4d6133d  glibc-2.12.2.tar.xz
+38d4feb7e6ea1427534c7a52442f51db  glibc-2.13-cross_hacks-2.patch
+62656d7d630781adb8f0186f201127cd  glibc-2.13-gnueabihf.patch
+24dfab6fd244f3773523412588ecc52c  glibc-2.13-prelink.patch
+cc5d8b1b994fb3b870222565c79853ca  glibc-2.13.tar.xz
 e9da82fa084dff26de7c484ce0c89a9a  glibc-ignore_origin.patch
 e9da82fa084dff26de7c484ce0c89a9a  glibc-ignore_origin.patch
-cb01ab976180e98287cef5079e35359e  glibc-ports-2.12.1.tar.bz2
+483f37cfdd619e81d8ca9e9d713944b5  glibc-ports-2.13.tar.bz2
 96156bec8e05de67384dc93e72bdc313  host.conf
 fbbc215a9b15ba4846f326cc88108057  hosts
 f7fefce570a3c776e26e778c5e401490  ld.so.conf
 96156bec8e05de67384dc93e72bdc313  host.conf
 fbbc215a9b15ba4846f326cc88108057  hosts
 f7fefce570a3c776e26e778c5e401490  ld.so.conf
-62001687bd94d1c0dd9a3654c64257d6  linux-2.6.35.tar.gz
+55b944af9b96651cf8a34e4a7fa38a1b  linux-2.6.35.6.tar.gz
 75931315bf9bc9be15a5e25e4ddd5f0d  nsswitch.conf
 acf9daad1ee85de5efd3543965596a63  resolv.conf
 75931315bf9bc9be15a5e25e4ddd5f0d  nsswitch.conf
 acf9daad1ee85de5efd3543965596a63  resolv.conf
diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index 6313e3a5595bd3c823ab1c44b8baa3b329267992..84e3579b1c1bffc246f8c292830bb529bfee573b 100644 (file)
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -5,27 +5,31 @@
 # Depends on:
 
 name=glibc
 # Depends on:
 
 name=glibc
-version=2.12.2
-release=2
+version=2.13
+release=1
 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
-        ftp://ftp.gnu.org/gnu/$name/$name-ports-2.12.1.tar.bz2 \
-        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.gz \
+        ftp://ftp.gnu.org/gnu/$name/$name-ports-$version.tar.bz2 \
+        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.6.tar.gz \
         glibc-ignore_origin.patch \
         Optimize-__getpagesize-a-bit.patch \
         $name-$version-cross_hacks-2.patch \
         glibc-ignore_origin.patch \
         Optimize-__getpagesize-a-bit.patch \
         $name-$version-cross_hacks-2.patch \
+        $name-$version-gnueabihf.patch \
+        $name-$version-prelink.patch \
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
   # install build kernel headers
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
   # install build kernel headers
-  cd linux-2.6.35
+  cd linux-2.6.35.6
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
 
   cd $SRC
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
 
   cd $SRC
-  mv $name-ports-2.12.1 $name-$version/ports
+  mv $name-ports-$version $name-$version/ports
 
   pushd $name-$version
 
   pushd $name-$version
+  patch -p1 -i $SRC/$name-$version-gnueabihf.patch
+  patch -p1 -i $SRC/$name-$version-prelink.patch
   patch -p1 -i $SRC/$name-$version-cross_hacks-2.patch
   patch -R -p1 -i $SRC/Optimize-__getpagesize-a-bit.patch
   patch -p1 -i $SRC/$name-ignore_origin.patch
   patch -p1 -i $SRC/$name-$version-cross_hacks-2.patch
   patch -R -p1 -i $SRC/Optimize-__getpagesize-a-bit.patch
   patch -p1 -i $SRC/$name-ignore_origin.patch
diff --git a/glibc/glibc-2.13-gnueabihf.patch b/glibc/glibc-2.13-gnueabihf.patch
new file mode 100644 (file)
index 0000000..64e3199
--- /dev/null
+++ b/glibc/glibc-2.13-gnueabihf.patch
@@ -0,0 +1,22 @@
+--- glibc-2.13/ports/sysdeps/arm/preconfigure  2010-12-06 20:43:02.000000000 +0000
++++ glibc-2.13.armhf//ports/sysdeps/arm/preconfigure   2011-05-06 15:57:15.087298361 +0000
+@@ -2,7 +2,7 @@
+ arm*)
+       base_machine=arm
+       case $config_os in
+-      linux-gnueabi)
++      linux-gnueabi*)
+               machine=arm/eabi/$machine
+               if [ "${CFLAGS+set}" != "set" ]; then
+                 CFLAGS="-g -O2"
+diff -ruN eglibc-2.13/ports/sysdeps/arm/shlib-versions eglibc-2.13.armhf//ports/sysdeps/arm/shlib-versions
+--- eglibc-2.13/ports/sysdeps/arm/shlib-versions       2006-08-17 01:23:58.000000000 +0000
++++ eglibc-2.13.armhf//ports/sysdeps/arm/shlib-versions        2011-05-06 15:57:27.067299108 +0000
+@@ -1,4 +1,4 @@
+-arm.*-.*-linux-gnueabi        DEFAULT                 GLIBC_2.4
++arm.*-.*-linux-gnueabi*       DEFAULT                 GLIBC_2.4
+ 
+-arm.*-.*-linux-gnueabi        ld=ld-linux.so.3
++arm.*-.*-linux-gnueabi*       ld=ld-linux.so.3
+ arm.*-.*-linux.*      ld=ld-linux.so.2
+
diff --git a/glibc/glibc-2.13-prelink.patch b/glibc/glibc-2.13-prelink.patch
new file mode 100644 (file)
index 0000000..bef7998
--- /dev/null
+++ b/glibc/glibc-2.13-prelink.patch
@@ -0,0 +1,26 @@
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 9a560b3..201c9cf 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+      we need it in the memory handling later.  */
+   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ 
++  /* Remember the last search directory added at startup, now that
++     malloc will no longer be the one from dl-minimal.c.  */
++  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
++
+   if (prelinked)
+     {
+       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
+@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+                         lossage);
+     }
+ 
+-  /* Remember the last search directory added at startup, now that
+-     malloc will no longer be the one from dl-minimal.c.  */
+-  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+-
+   if (! prelinked && rtld_multiple_ref)
+     {
+       /* There was an explicit ref to the dynamic linker as a shared lib.
Ports repository to generate crossrootfs