diff options
Diffstat (limited to 'meta/packages/uclibc/uclibc.inc')
-rw-r--r-- | meta/packages/uclibc/uclibc.inc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc index 0a22ae0271..2c9530eadd 100644 --- a/meta/packages/uclibc/uclibc.inc +++ b/meta/packages/uclibc/uclibc.inc | |||
@@ -76,8 +76,8 @@ EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}'" | |||
76 | EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" | 76 | EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" |
77 | EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" | 77 | EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" |
78 | 78 | ||
79 | KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include" | 79 | KERNEL_SOURCE = "${STAGING_INCDIR}" |
80 | KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include" | 80 | KERNEL_HEADERS = "${STAGING_INCDIR}" |
81 | 81 | ||
82 | # Lets munge this via siteinfo.bbclass as well: | 82 | # Lets munge this via siteinfo.bbclass as well: |
83 | # ARCH_BIG_ENDIAN=y | 83 | # ARCH_BIG_ENDIAN=y |
@@ -140,15 +140,19 @@ do_configure() { | |||
140 | echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config | 140 | echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config |
141 | fi | 141 | fi |
142 | 142 | ||
143 | oe_runmake oldconfig | 143 | yes '' | oe_runmake oldconfig |
144 | } | 144 | } |
145 | 145 | ||
146 | do_stage() { | 146 | do_stage() { |
147 | # This MUST be done first because we | ||
148 | # will install crt1.o in the install_dev stage and gcc needs it | ||
149 | |||
150 | # Install into the staging dir | ||
147 | oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | 151 | oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ |
148 | RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | 152 | RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ |
149 | install_dev install_runtime | 153 | install_dev install_runtime |
150 | 154 | ||
151 | oe_runmake utils | 155 | # Install into the staging dir |
152 | oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | 156 | oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ |
153 | RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | 157 | RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ |
154 | install_utils | 158 | install_utils |
@@ -168,8 +172,14 @@ do_stage() { | |||
168 | } | 172 | } |
169 | 173 | ||
170 | do_install() { | 174 | do_install() { |
175 | # Tis MUST be done first because we | ||
176 | # will install crt1.o in the install_dev stage and gcc needs it) | ||
177 | oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | ||
178 | RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ | ||
179 | install_dev install_runtime | ||
180 | |||
171 | oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ | 181 | oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ |
172 | install_dev install_runtime install_utils | 182 | install_dev install_runtime |
173 | 183 | ||
174 | # We don't really need this in ${includedir} | 184 | # We don't really need this in ${includedir} |
175 | rm -f ${D}${prefix}/include/.cvsignore | 185 | rm -f ${D}${prefix}/include/.cvsignore |
@@ -195,5 +205,9 @@ do_install() { | |||
195 | mv ${D}/usr/bin/* ${D}${bindir}/ | 205 | mv ${D}/usr/bin/* ${D}${bindir}/ |
196 | rmdir ${D}/usr/bin | 206 | rmdir ${D}/usr/bin |
197 | fi | 207 | fi |
208 | |||
209 | oe_runmake utils | ||
210 | oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ | ||
211 | install_utils | ||
198 | } | 212 | } |
199 | 213 | ||