From c9952f3a144d9fb19917d7c100dca30d2d99f629 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 13 Jul 2013 01:48:00 -0700 Subject: Sat Jul 13 01:47:15 PDT 2013 --- ~coadde/cross-binutils/PKGBUILD | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to '~coadde/cross-binutils/PKGBUILD') diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD index f7750d5ae..5f322af4f 100644 --- a/~coadde/cross-binutils/PKGBUILD +++ b/~coadde/cross-binutils/PKGBUILD @@ -131,7 +131,6 @@ prepare() { build() { cd ${srcdir}/${_pkgname}-build - msg "The 'lib64(lib)' and 'lib(lib32)' will be fixed on _target-binutils() on ldscripts files" [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}" if [[ $CARCH == x86_64 || $CARCH == mips64el || @@ -139,9 +138,9 @@ build() { $CARCH == aarch64_be || $CARCH == sparc64 || $CARCH == ia64 ]]; then - _LIB_PATH="--with-lib-path=/usr/lib64:/usr/lib:/usr/local/lib64:/usr/local/lib:/usr/${_target}/lib64:/usr/${_target}/lib" + _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32" else - _LIB_PATH="--with-lib-path=/usr/lib32:/usr/local/lib32:/usr/${_target}/lib32" + _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib" fi if [[ ${_multilib} == "yes" ]]; then @@ -186,13 +185,12 @@ _target-binutils() { depends=('glibc>=2.17' 'zlib' "${_pkgname}-common") [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}") if [[ ${_multilib} == "yes" ]]; then - #conflicts=("${pkgname}") groups+=('multilib-devel') else groups+=('base-devel') fi groups+=("${_target}-devel") - install="${_target}-${_pkgname}.install" + install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install" cd ${srcdir}/${_pkgname}-build make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install @@ -215,7 +213,7 @@ _target-binutils() { } msg "Change lib-path on ldscripts files" - sed -i "/^SEARCH_DIR/ s|/${_target}/lib|/lib|g; + sed -i "/^SEARCH_DIR/ s|/${pkgver}/${_target}/lib|/${pkgver}/lib|g; /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g; /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g; /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g; @@ -229,7 +227,7 @@ _target-binutils() { msg "Create links for libraries" install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d} - ln -vs ../../lib ${pkgdir}/usr/${_target}/lib + ln -vs ../lib ${pkgdir}/usr/${_target}/lib echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf msg "Install PIC libiberty.a" @@ -252,11 +250,15 @@ _target-binutils() { # GNU/Linux-libre with GNU C Library (glibc) package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; } +package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; } package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; } +package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } package_i686-pc-linux-gnu-binutils() { _target-binutils; } package_i586-pc-linux-gnu-binutils() { _target-binutils; } package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; } +package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; } +package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; } package_arm-unknown-linux-gnueabi-binutils() { _target-binutils; } package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; } package_armv7-unknown-linux-gnueabi-binutils() { _target-binutils; } @@ -266,19 +268,27 @@ package_armv6eb-unknown-linux-gnueabi-binutils() { _target-binutils; } package_armv5-unknown-linux-gnueabi-binutils() { _target-binutils; } package_armv5eb-unknown-linux-gnueabi-binutils() { _target-binutils; } package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; } +package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } package_ia64-unknown-linux-gnu-binutils() { _target-binutils; } +package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } # GNU package_x86_64-unknown-gnu-binutils() { _target-binutils; } +package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; } package_i686-pc-gnu-binutils() { _target-binutils; } package_i586-pc-gnu-binutils() { _target-binutils; } # GNU/Linux-libre with uClibc package_mips64el-unknown-uclinux-gnu-binutils() { _target-binutils; } +package_mips64el-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; } package_x86_64-unknown-uclinux-gnu-binutils() { _target-binutils; } +package_x86_64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; } package_i686-pc-uclinux-gnu-binutils() { _target-binutils; } package_i586-pc-uclinux-gnu-binutils() { _target-binutils; } package_aarch64-unknown-uclinux-gnu-binutils() { _target-binutils; } +package_aarch64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; } +package_aarch64_be-unknown-uclinux-gnu-binutils() { _target-binutils; } +package_aarch64_be-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; } package_arm-unknown-uclinux-gnueabi-binutils() { _target-binutils; } package_armeb-unknown-uclinux-gnueabi-binutils() { _target-binutils; } package_armv7-unknown-uclinux-gnueabi-binutils() { _target-binutils; } @@ -292,27 +302,38 @@ package_armv5eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; } package_xtensa-unknown-elf-binutils() { _target-binutils; } package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; } package_mips64el-unknown-elf-binutils() { _target-binutils; } +package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; } package_mips64-unknown-elf-binutils() { _target-binutils; } +package_mips64-unknown-elf-binutils-multilib() { _target-binutils; } package_mips32el-unknown-elf-binutils() { _target-binutils; } package_mips32-unknown-elf-binutils() { _target-binutils; } package_x86_64-unknown-elf-binutils() { _target-binutils; } +package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; } package_i686-unknown-elf-binutils() { _target-binutils; } package_i586-unknown-elf-binutils() { _target-binutils; } package_i386-unknown-elf-binutils() { _target-binutils; } package_aarch64-unknown-elf-binutils() { _target-binutils; } +package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; } package_aarch64_be-unknown-elf-binutils() { _target-binutils; } +package_aarch64_be-unknown-elf-binutils-multilib() { _target-binutils; } package_arm-unknown-eabi-binutils() { _target-binutils; } package_armeb-unknown-eabi-binutils() { _target-binutils; } package_powerpc64-unknown-elf-binutils() { _target-binutils; } +package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; } package_powerpc64le-unknown-elf-binutils() { _target-binutils; } +package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; } package_powerpc32-unknown-elf-binutils() { _target-binutils; } package_powerpc32le-unknown-elf-binutils() { _target-binutils; } package_powerpc64-unknown-eabi-binutils() { _target-binutils; } +package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; } package_powerpc64le-unknown-eabi-binutils() { _target-binutils; } +package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; } package_powerpc32-unknown-eabi-binutils() { _target-binutils; } package_powerpc32le-unknown-eabi-binutils() { _target-binutils; } package_sh64-unknown-elf-binutils() { _target-binutils; } +package_sh64-unknown-elf-binutils-multilib() { _target-binutils; } package_sh64l-unknown-elf-binutils() { _target-binutils; } +package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; } package_sh-unknown-elf-binutils() { _target-binutils; } package_shl-unknown-elf-binutils() { _target-binutils; } package_m68k-unknown-elf-binutils() { _target-binutils; } -- cgit v1.2.3-54-g00ecf