binutils: create usr/include

4 files changed, 6 insertions, 48 deletions

diff --git a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index d4d3afe38..000000000
--- a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Vojtech Horky <vojta . horky at-symbol seznam . cz>
-
-_pkgname=binutils
-_target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/${_target}"
-
-unset CFLAGS CXXFLAGS LDFLAGS
-
-pkgname=cross-${_target}-binutils
-pkgver=2.22
-pkgrel=11
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the MIPS architecture"
-url="http://www.gnu.org/software/binutils/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('zlib')
-source=("ftp://ftp.gnu.org/gnu/binutils/${_pkgname}-${pkgver}.tar.bz2")
-md5sums=('ee0f10756c84979622b992a4a61ea3f5')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-
-    CFLAGS=" -pipe "\
-    CXXFLAGS=" -pipe "\
-    ./configure --build=${CHOST} \
-                --host=${CHOST} \
-                --target=${_target} \
-                --prefix=/usr \
-                --disable-nls \
-                --disable-multilib \
-                --disable-werror \
-                --enable-ld=yes \
-                --enable-gold=no \
-                --with-sysroot=${_sysroot}
-
-	make 
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	
-	make DESTDIR=${pkgdir} install
-
-    rm -r ${pkgdir}/usr/{lib,share}
-}
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 3c61dbfca..ca0ca775e 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD
@@ -16,7 +16,7 @@ pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (share
 url="http://www.gnu.org/software/binutils/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
+depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl')
 makedepends=("cross-${_target}-glibc-headers"
              "cross-${_target}-gcc-core")
 options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
@@ -28,7 +28,7 @@ build() {
   mkdir gcc-build && cd gcc-build
   mkdir ${_target}
 
-  Copy headers for libgcc2
+#  Copy headers for libgcc2
   cp -av /usr/${_target}/usr/include ${_target}/include
 
     CC_FOR_BUILD=${CHOST}-gcc \
diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
index da49a903f..831236d42 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
@@ -16,7 +16,7 @@ pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (stati
 url="http://www.gnu.org/software/binutils/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl')
+depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl')
 options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
 source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
 md5sums=('028115c4fbfb6cfd75d6369f4a90d87e')
diff --git a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
index f03ce3b47..ac37a0241 100644
--- a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
@@ -43,4 +43,7 @@ package() {
 	make DESTDIR=${pkgdir} install
 
     rm -r ${pkgdir}/usr/{lib,share}
+
+# Create include dir so gcc-core doesn't complain
+    mkdir -p ${pkgdir}${_sysroot}/usr/include
 }