summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-03-18 17:57:30 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-03-18 17:57:30 +0100
commit54dd02cd77554542994a6db5bf6cd31e640bb990 (patch)
treef65abb90d76fed271b224c9dda820899b529d7f0
parent6c6894e48cc7b54ecbfdbc9341c8d3cf6f3b6c51 (diff)
Fix building the mips64el cross toolchain.
-rw-r--r--cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD1
-rw-r--r--cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD1
-rw-r--r--cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD19
-rw-r--r--cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD45
4 files changed, 4 insertions, 62 deletions
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
index ca0ca775e..2eb018125 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
@@ -54,7 +54,6 @@ build() {
--enable-cloog-backend=isl \
--with-libelf \
--enable-lto \
- --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
--enable-target-optspace \
--disable-libgomp \
--disable-libmudflap \
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
index 831236d42..47ef81fe1 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
@@ -49,7 +49,6 @@ build() {
--with-ppl \
--enable-cloog-backend=isl \
--enable-lto \
- --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \
--enable-target-optspace \
--disable-libgomp \
--disable-libmudflap \
diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
index 7fed7839a..9b03da6d7 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
@@ -44,6 +44,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgname}-${pkgver}_${_glibcdate}.
locale-gen)
md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'a006504b83553d0b554cf8badff005b6'
+ '39f80ba6bcda6b010a66f9c61e9a0017'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
@@ -188,6 +189,7 @@ package() {
# This will help gcc-shared to find headers for libgcc2
msg2 "Symlinking headers"
# rm -r ${pkgdir}${_sysroot}/include
+ mkdir -p ${pkgdir}${_sysroot}/lib/
ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include
ln -s ${_sysroot}/usr/lib/crt1.o ${pkgdir}${_sysroot}/lib/
ln -s ${_sysroot}/usr/lib/crti.o ${pkgdir}${_sysroot}/lib/
@@ -195,20 +197,3 @@ package() {
ln -s ${_sysroot}/usr/lib/libc.so ${pkgdir}${_sysroot}/lib/
}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '98d028ee63fca2821414ebcac0af0e5b'
- '39f80ba6bcda6b010a66f9c61e9a0017'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
index 18de66776..9f13285b4 100644
--- a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
@@ -69,6 +69,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'3c219ddfb619b6df903cac4cc42c611d'
'7ae3e426251ae33e73dbad71f9c91378'
'dc7550e659ddd685bd78a930d15a01f2'
+ '39f80ba6bcda6b010a66f9c61e9a0017'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -219,7 +220,7 @@ package() {
# Fix libc.so to find correct libraries
if ${BOOTSTRAPING}; then
sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libc.so
- sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthreads.so
+ sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthread.so
fi
install -dm755 ${pkgdir}${_sysroot}/etc/rc.d
@@ -240,15 +241,6 @@ package() {
${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen
sed -i "s|^|#|g" ${pkgdir}${_sysroot}/etc/locale.gen
- if [[ ${CARCH} = "x86_64" ]]; then
- # fix for the linker
- sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/bin/ldd
- # Comply with multilib binaries, they look for the linker in /lib64
- mkdir ${pkgdir}${_sysroot}/lib64
- cd ${pkgdir}${_sysroot}/lib64
- ln -v -s ../lib/ld* .
- fi
-
# Do not strip the following files for improved debugging support
# ("improved" as in not breaking gdb and valgrind...):
# ld-${pkgver}.so
@@ -274,36 +266,3 @@ package() {
# lib/{libmemusage,libpcprofile,libSegFault}.so \
# usr/lib/{pt_chown,{audit,gconv}/*.so}
}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '98d028ee63fca2821414ebcac0af0e5b'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '98d028ee63fca2821414ebcac0af0e5b'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- '39f80ba6bcda6b010a66f9c61e9a0017'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')