diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2023-04-30 00:00:00 +0000 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-10 02:03:08 +0100 |
| commit | e5fd7ef3aca87539acc278f2b724e7e47fc4ce41 (patch) | |
| tree | 5987811071d19bc977083f1e0ce9369b0a4cc042 /bin/ebuild-helpers | |
| parent | NEWS: Fix underlines (diff) | |
| download | portage-e5fd7ef3aca87539acc278f2b724e7e47fc4ce41.tar.gz portage-e5fd7ef3aca87539acc278f2b724e7e47fc4ce41.tar.bz2 portage-e5fd7ef3aca87539acc278f2b724e7e47fc4ce41.zip | |
Delete remnants of CONF_LIBDIR
Support for CONF_LIBDIR was initially added on 2004-08-16 in:
https://gitweb.gentoo.org/archive/proj/portage-cvs.git/commit/?id=ecc2faaa00b1e6250129267ba873bedd2121eac5
Support for LIBDIR_${ABI} was initially added on 2005-02-26 in:
https://gitweb.gentoo.org/archive/proj/portage-cvs.git/commit/?id=64779fdecc8e4ec7d2cb9a6fa70066694f78231d
Since then, CONF_LIBDIR was not used if ABI and LIBDIR_${ABI} were set.
CONF_LIBDIR was set only in 2004.3 profiles:
https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=1482b856ad2a301c8eb2245a7c7265350af2691d
LIBDIR_${ABI} was set in profiles starting with 2005.0 profiles:
https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=054e484d8717a18622615e019e7cd62495365192
https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=a1f9392206c050c2b952c3e1281b731f1c969bc9
Bug: https://bugs.gentoo.org/75420
Bug: https://bugs.gentoo.org/267159
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Closes: https://github.com/gentoo/portage/pull/1032
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/dolib | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib index 44e16f503..d6d21314b 100755 --- a/bin/ebuild-helpers/dolib +++ b/bin/ebuild-helpers/dolib @@ -22,15 +22,13 @@ else fi # Setup ABI cruft -LIBDIR_VAR="LIBDIR_${ABI}" -if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then - CONF_LIBDIR=${!LIBDIR_VAR} +libdir="lib" +libdir_var="LIBDIR_${ABI}" +if [[ -n ${ABI} && -n ${!libdir_var} ]] ; then + libdir=${!libdir_var} fi -unset LIBDIR_VAR -# We need this to default to lib so that things dont break -CONF_LIBDIR=${CONF_LIBDIR:-lib} -libdir="${ED%/}/${__E_DESTTREE#/}/${CONF_LIBDIR}" +libdir="${ED%/}/${__E_DESTTREE#/}/${libdir}" if [[ $# -lt 1 ]] ; then __helpers_die "${0##*/}: at least one argument needed" |