Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 426038 Details for
Bug 330769
app-eselect/eselect-mesa does not like if /usr/lib{,64}/dri is a symlink
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Handle SYMLINK_LIB=no
no-symlink.patch (text/plain), 3.15 KB, created by
Steven Newbury
on 2016-02-20 23:33:04 UTC
(
hide
)
Description:
Handle SYMLINK_LIB=no
Filename:
MIME Type:
Creator:
Steven Newbury
Created:
2016-02-20 23:33:04 UTC
Size:
3.15 KB
patch
obsolete
>--- mesa.eselect.orig 2011-04-09 18:59:58.000000000 +0100 >+++ mesa.eselect 2015-06-02 11:31:26.624676616 +0100 >@@ -9,10 +9,19 @@ > EBUILD_VERSION="0.0.10" > > MESA_CONF_DIR="${EROOT}/usr/share/mesa" >-MESA_DIR_64="${EROOT}/usr/lib/mesa" >-DRI_DIR_64="${EROOT}/usr/lib/dri" >-MESA_DIR_32="${EROOT}/usr/lib32/mesa" >-DRI_DIR_32="${EROOT}/usr/lib32/dri" >+if [[ -L /usr/lib ]]; then >+ MESA_DIR_64="${EROOT}/usr/lib/mesa" >+ DRI_DIR_64="${EROOT}/usr/lib/dri" >+ MESA_DIR_32="${EROOT}/usr/lib32/mesa" >+ DRI_DIR_32="${EROOT}/usr/lib32/dri" >+else >+ MESA_DIR_64="${EROOT}/usr/lib64/mesa" >+ DRI_DIR_64="${EROOT}/usr/lib64/dri" >+ MESA_DIR_32="${EROOT}/usr/lib/mesa" >+ DRI_DIR_32="${EROOT}/usr/lib/dri" >+ MESA_DIR_X32="${EROOT}/usr/libx32/mesa" >+ DRI_DIR_X32="${EROOT}/usr/libx32/dri" >+fi > > # receives a filename of the driver as argument, outputs the architecture (classic or gallium) > drivername_to_architecture() { >@@ -98,9 +107,11 @@ > > do_show() { > source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" >- if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then >+ if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]] || >+ [[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then > MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doshow_helper > MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " doshow_helper >+ MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="x32 " doshow_helper > else > MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} doshow_helper > fi >@@ -130,9 +141,11 @@ > > do_list() { > source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config" >- if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then >+ if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]] || \ >+ [[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then > MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " dolist_helper > MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " dolist_helper >+ MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="x32 " dolist_helper > else > MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} dolist_helper > fi >@@ -144,11 +157,11 @@ > } > > describe_set_parameters() { >- echo "[32bit|64bit] [--auto|<family> <architecture>]" >+ echo "[32bit|64bit|x32] [--auto|<family> <architecture>]" > } > > describe_set_options() { >- echo "32bit, 64bit : (optional) Apply changes to 32 bit or 64 bit multilib only" >+ echo "32bit, 64bit, x32 : (optional) Apply changes to 32 bit or 64 bit multilib only" > echo "--auto : Sets all drivers which are not already set" > echo "<family> : The chipset family, or sw for software renderer" > echo "<architecture> : The driver architecture" >@@ -210,6 +223,12 @@ > else > write_warning_msg "The 32bit parameter is intended for multilib systems only" > fi >+ elif [[ $1 == "x32" ]]; then >+ if [[ -d "${MESA_DIR_X32}" && -d "${DRI_DIR_X32}" ]]; then >+ MESA_DIR=${MESA_DIR_X32} DRI_DIR=${DRI_DIR_X32} multiarch="$1 " doset_helper $2 $3 >+ else >+ write_warning_msg "The 32bit/x32 parameter is intended for multilib systems only" >+ fi > else > if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then > MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doset_helper $1 $2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 330769
: 426038