|
Lines 196-202
Link Here
|
| 196 |
case "${opt}" in |
196 |
case "${opt}" in |
| 197 |
nls) |
197 |
nls) |
| 198 |
USE_NLS=1 |
198 |
USE_NLS=1 |
| 199 |
STAGE1_USE="${STAGE1_USE} nls" |
199 |
ALLOWED_USE="${ALLOWED_USE} nls" |
| 200 |
;; |
200 |
;; |
| 201 |
nptl) |
201 |
nptl) |
| 202 |
if [[ -z $(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0') ]] ; then |
202 |
if [[ -z $(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0') ]] ; then |
|
Lines 213-222
Link Here
|
| 213 |
USE_NPTLONLY=1 |
213 |
USE_NPTLONLY=1 |
| 214 |
;; |
214 |
;; |
| 215 |
multilib) |
215 |
multilib) |
| 216 |
STAGE1_USE="${STAGE1_USE} multilib" |
216 |
ALLOWED_USE="${ALLOWED_USE} multilib" |
| 217 |
;; |
217 |
;; |
| 218 |
userlocales) |
218 |
userlocales) |
| 219 |
STAGE1_USE="${STAGE1_USE} userlocales" |
219 |
ALLOWED_USE="${ALLOWED_USE} userlocales" |
| 220 |
;; |
220 |
;; |
| 221 |
esac |
221 |
esac |
| 222 |
done |
222 |
done |
|
Lines 249-257
Link Here
|
| 249 |
if [[ ${USE_NPTL} = "1" ]] ; then |
249 |
if [[ ${USE_NPTL} = "1" ]] ; then |
| 250 |
myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')" |
250 |
myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')" |
| 251 |
[[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}" |
251 |
[[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}" |
| 252 |
STAGE1_USE="${STAGE1_USE} nptl" |
252 |
ALLOWED_USE="${ALLOWED_USE} nptl" |
| 253 |
# Should we build with nptl only? |
253 |
# Should we build with nptl only? |
| 254 |
[[ ${USE_NPTLONLY} = "1" ]] && STAGE1_USE="${STAGE1_USE} nptlonly" |
254 |
[[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly" |
| 255 |
fi |
255 |
fi |
| 256 |
[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers" |
256 |
[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers" |
| 257 |
|
257 |
|
|
Lines 295-305
Link Here
|
| 295 |
|
295 |
|
| 296 |
if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then |
296 |
if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then |
| 297 |
show_status 2 Updating portage |
297 |
show_status 2 Updating portage |
| 298 |
${V_ECHO} USE="-* build bootstrap ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1 |
298 |
${V_ECHO} USE="-* build bootstrap ${ALLOWED_USE} ${STAGE1_USE}" emerge ${STRAP_EMERGE_OPTS} ${myPORTAGE} || cleanup 1 |
| 299 |
echo ------------------------------------------------------------------------------- |
299 |
echo ------------------------------------------------------------------------------- |
| 300 |
set_bootstrap_stage 2 |
300 |
set_bootstrap_stage 2 |
| 301 |
fi |
301 |
fi |
| 302 |
export USE="-* bootstrap ${STAGE1_USE}" |
302 |
export USE="-* bootstrap ${ALLOWED_USE} ${STAGE1_USE}" |
| 303 |
|
303 |
|
| 304 |
# We can't unmerge headers which may or may not exist yet. If your |
304 |
# We can't unmerge headers which may or may not exist yet. If your |
| 305 |
# trying to use nptl, it may be needed to flush out any old headers |
305 |
# trying to use nptl, it may be needed to flush out any old headers |
