diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-12 06:04:45 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-12 06:04:45 -0300 |
| commit | 27dcaa78d84f40dc6254f3e731fb2af966c92bf4 (patch) | |
| tree | 71786f69b3f995d4a66c8c7e25b6154dc3ddb044 | |
| parent | 7c466735fb86bba16c9366629fe160ae2fd5c25d (diff) | |
| download | abslibre-27dcaa78d84f40dc6254f3e731fb2af966c92bf4.tar.gz abslibre-27dcaa78d84f40dc6254f3e731fb2af966c92bf4.tar.bz2 abslibre-27dcaa78d84f40dc6254f3e731fb2af966c92bf4.zip | |
cross-binutils: adding droped --program-suffix flag, and fixing 'binutils' and 'multilib' variables
| -rw-r--r-- | ~coadde/cross-binutils/PKGBUILD | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD index 9a3a4b521..e7d253ed2 100644 --- a/~coadde/cross-binutils/PKGBUILD +++ b/~coadde/cross-binutils/PKGBUILD @@ -3,8 +3,6 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -_pkgname="binutils" - #+-------------------+-----------------------+-------------+------------------------------+ #| _CARCH | _os (GNU/Linux-libre) | _os (GNU) | _os (GNU/Linux-libre uClibc) | #+-------------------+-----------------------+-------------+------------------------------+ @@ -34,9 +32,11 @@ _pkgname="binutils" #| m68k | unknown-elf | #+----------------+--------------------+ +_pkgname="binutils" + ### Base FLAGS: ### -_CARCH="i686" -_os="pc-linux-gnu" +_CARCH="x86_64" +_os="unknown-linux-gnu" _target="${_CARCH}-${_os}" _multilib="no" @@ -56,7 +56,7 @@ _patch_ath9k_htc_fw="no" } pkgname=( - "${_target}-${_pkgname}${_multilib}${_ath9k_htc_name}" + "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}" "${_pkgname}-common" ) pkgver=2.23.2 @@ -113,9 +113,10 @@ build() { _MULTILIB='--disable-multilib' fi - ${srcdir}/binutils-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \ + ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \ $_TARGET $_LIB_PATH \ --program-prefix=${_target}- \ + --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \ --with-bugurl=https://labs.parabola.nu/ \ --enable-ld=default --enable-gold \ --enable-plugins --enable-threads \ @@ -196,7 +197,7 @@ _target-binutils() { msg "Remove unnecessaries manuals and create links for manuals" _man=$(ls -1A ${pkgdir}/usr/share/man/man1) for _man_stage1 in ${_man[@]}; do - _man_stage2=${_man_stage1/-${pkgver}/} + _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/} _manuals=${_man_stage2/${_target}-/} rm -v ${pkgdir}/usr/share/man/man1/${_man_stage1} ln -vs ${_manuals}.gz ${pkgdir}/usr/share/man/man1/${_man_stage1}.gz @@ -300,7 +301,7 @@ package_binutils-common() { msg "Rename manuals" _man=$(ls -1A ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1) for _man_stage1 in ${_man[@]}; do - _man_stage2=${_man_stage1/-${pkgver}/} + _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/} _manuals=${_man_stage2/${_target}-/} mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}} done |