summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-10-17 14:59:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-22 14:59:30 +0100
commit394f284beb6044ff4e339e58696747730e4cf380 (patch)
tree5a10b1e2021686b83e69b046e9dc01e8f146233e /meta/recipes-core
parent59e3a13604fbf28ed89031e7f107c193b238d7fd (diff)
downloadpoky-394f284beb6044ff4e339e58696747730e4cf380.tar.gz
eglibc-2.16: Use tar ball instead of svn SRC_URI
Adapt the recipes to fetch a tarball. Tarball is generated from latest 2.16 branch which has e500-math_private.patch already applied hence we remove that patch. (From OE-Core rev: 77ee4d7d88976c7bb2bb25b57e06b83edaacbd4c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.16.bb20
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/e500-math_private.patch31
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb19
3 files changed, 20 insertions, 50 deletions
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
index a79a276ae4..11970e70c0 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "LGPL-2.1" 4LICENSE = "LGPL-2.1"
5 5
6LIC_DIR = "${WORKDIR}/${EGLIBC_BRANCH}/libc" 6LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc"
7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9\ 7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9\
8 file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 8 file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
@@ -16,26 +16,28 @@ inherit autotools
16# pick up an eglibc-2.16 patch 16# pick up an eglibc-2.16 patch
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" 17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18 18
19PR = "r1" 19PR = "r2"
20SRCREV="19383" 20SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2 \
21EGLIBC_BRANCH="eglibc-2_16"
22SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
23 file://fix_for_centos_5.8.patch;patchdir=.. \ 21 file://fix_for_centos_5.8.patch;patchdir=.. \
24 " 22 "
25S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" 23
24SRC_URI[md5sum] = "88894fa6e10e58e85fbd8134b8e486a8"
25SRC_URI[sha256sum] = "460a45f422da6eb1fd909baab6a64b5ae4c8ba18ea05a1491ed1024c8b98eeaa"
26
27S = "${WORKDIR}/eglibc-${PV}/localedef"
26 28
27do_unpack_append() { 29do_unpack_append() {
28 bb.build.exec_func('do_move_ports', d) 30 bb.build.exec_func('do_move_ports', d)
29} 31}
30 32
31do_move_ports() { 33do_move_ports() {
32 if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then 34 if test -d ${WORKDIR}/eglibc-${PV}/ports ; then
33 rm -rf ${WORKDIR}/libc/ports 35 rm -rf ${WORKDIR}/libc/ports
34 mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${WORKDIR}/libc/ 36 mv ${WORKDIR}/eglibc-${PV}/ports ${WORKDIR}/libc/
35 fi 37 fi
36} 38}
37 39
38EXTRA_OECONF = "--with-glibc=${WORKDIR}/${EGLIBC_BRANCH}/libc" 40EXTRA_OECONF = "--with-glibc=${WORKDIR}/eglibc-${PV}/libc"
39CFLAGS += "-DNOT_IN_libc=1" 41CFLAGS += "-DNOT_IN_libc=1"
40 42
41do_configure () { 43do_configure () {
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/e500-math_private.patch b/meta/recipes-core/eglibc/eglibc-2.16/e500-math_private.patch
deleted file mode 100644
index 9dbb26e1e4..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/e500-math_private.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Match with the latest math_private restructuring in glibc
2
3as done here
4
5http://sourceware.org/ml/libc-alpha/2012-03/msg00302.html
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Pending
10
11Index: libc/ports/sysdeps/powerpc/powerpc32/e500/fpu/math_private.h
12===================================================================
13--- libc.orig/ports/sysdeps/powerpc/powerpc32/e500/fpu/math_private.h 2012-07-17 22:58:20.340405923 -0700
14+++ libc/ports/sysdeps/powerpc/powerpc32/e500/fpu/math_private.h 2012-07-17 22:58:21.120405923 -0700
15@@ -1 +1 @@
16-#include <math/math_private.h>
17+#include_next <sysdeps/generic/math_private.h>
18Index: libc/ports/sysdeps/powerpc/powerpc32/e500/fpu/fraiseexcpt.c
19===================================================================
20--- libc.orig/ports/sysdeps/powerpc/powerpc32/e500/fpu/fraiseexcpt.c 2012-07-17 23:15:15.872405939 -0700
21+++ libc/ports/sysdeps/powerpc/powerpc32/e500/fpu/fraiseexcpt.c 2012-07-17 23:18:42.760405602 -0700
22@@ -23,7 +23,7 @@
23
24 #undef feraiseexcept
25
26-#define __FERAISEEXCEPT_INTERNAL feraiseexcept
27+#define __FERAISEEXCEPT_INTERNAL __feraiseexcept
28 #include "../spe-raise.c"
29
30-libm_hidden_def (feraiseexcept)
31+libm_hidden_ver (__feraiseexcept, feraiseexcept)
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 2c1018f21c..56a0a38192 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -1,13 +1,9 @@
1require eglibc.inc 1require eglibc.inc
2 2
3SRCREV = "20393"
4
5DEPENDS += "gperf-native kconfig-frontends-native" 3DEPENDS += "gperf-native kconfig-frontends-native"
6PR = "r16" 4PR = "r17"
7PR_append = "+svnr${SRCPV}"
8 5
9EGLIBC_BRANCH="eglibc-2_16" 6SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2 \
10SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
11 file://eglibc-svn-arm-lowlevellock-include-tls.patch \ 7 file://eglibc-svn-arm-lowlevellock-include-tls.patch \
12 file://IO-acquire-lock-fix.patch \ 8 file://IO-acquire-lock-fix.patch \
13 file://mips-rld-map-check.patch \ 9 file://mips-rld-map-check.patch \
@@ -21,7 +17,6 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
21 file://initgroups_keys.patch \ 17 file://initgroups_keys.patch \
22 file://eglibc_fix_findidx_parameters.patch \ 18 file://eglibc_fix_findidx_parameters.patch \
23 file://ppc_slow_ieee754_sqrt.patch \ 19 file://ppc_slow_ieee754_sqrt.patch \
24 file://e500-math_private.patch \
25 file://fileops-without-wchar-io.patch \ 20 file://fileops-without-wchar-io.patch \
26 file://add_resource_h_to_wait_h.patch \ 21 file://add_resource_h_to_wait_h.patch \
27 file://0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch \ 22 file://0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch \
@@ -33,6 +28,10 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
33 file://fsl-ppc-no-fsqrt.patch \ 28 file://fsl-ppc-no-fsqrt.patch \
34 file://0001-R_ARM_TLS_DTPOFF32.patch \ 29 file://0001-R_ARM_TLS_DTPOFF32.patch \
35 " 30 "
31
32SRC_URI[md5sum] = "88894fa6e10e58e85fbd8134b8e486a8"
33SRC_URI[sha256sum] = "460a45f422da6eb1fd909baab6a64b5ae4c8ba18ea05a1491ed1024c8b98eeaa"
34
36LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \ 35LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
37 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 36 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
38 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 37 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
@@ -41,7 +40,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
41SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \ 40SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \
42 file://relocatable_sdk.patch \ 41 file://relocatable_sdk.patch \
43 " 42 "
44S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" 43S = "${WORKDIR}/eglibc-${PV}/libc"
45B = "${WORKDIR}/build-${TARGET_SYS}" 44B = "${WORKDIR}/build-${TARGET_SYS}"
46 45
47PACKAGES_DYNAMIC = "" 46PACKAGES_DYNAMIC = ""
@@ -93,9 +92,9 @@ do_unpack_append() {
93} 92}
94 93
95do_move_ports() { 94do_move_ports() {
96 if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then 95 if test -d ${WORKDIR}/eglibc-${PV}/ports ; then
97 rm -rf ${S}/ports 96 rm -rf ${S}/ports
98 mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/ 97 mv ${WORKDIR}/eglibc-${PV}/ports ${S}/
99 fi 98 fi
100} 99}
101 100