tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gcc: add armv5te defs; sprinkle some lib32disabled; move all c++ headers to libstdc++-devel.

Browse Source
This commit is contained in:
Juan RP 2014-03-19 10:29:25 +01:00
parent fdbc29077b
commit 1a630bd7b1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srcpkgs/gcc/template
View File

@ -2,7 +2,7 @@
pkgname=gcc pkgname=gcc
_majorver=4.7 _majorver=4.7
version=${_majorver}.3 version=${_majorver}.3
revision=10 revision=11
patch_args="-Np1" patch_args="-Np1"
short_desc="The GNU C Compiler" short_desc="The GNU C Compiler"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -11,6 +11,7 @@ license="GFDL-1.2, GPL-3, LGPL-2.1"
distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
checksum=2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 checksum=2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
lib32disabled=yes
hostmakedepends="perl flex" hostmakedepends="perl flex"
makedepends="zlib-devel libmpc-devel>=1.0.1_2 ppl-devel>=1.0 cloog-devel isl-devel libfl-devel" makedepends="zlib-devel libmpc-devel>=1.0.1_2 ppl-devel>=1.0 cloog-devel isl-devel libfl-devel"
depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
@ -47,6 +48,7 @@ do_configure() {
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
armv5*) _args+=" --with-arch=armv5te --with-float=soft";;
armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";; armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";; armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
esac esac
@ -132,6 +134,7 @@ do_install() {
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
gcc-gcj_package() { gcc-gcj_package() {
lib32disabled=yes
depends="gcc>=${_majorver} libgcj-devel>=${_majorver} eclipse-ecj" depends="gcc>=${_majorver} libgcj-devel>=${_majorver} eclipse-ecj"
short_desc="GCC Java compiler frontend" short_desc="GCC Java compiler frontend"
pkg_install() { pkg_install() {
@ -158,6 +161,7 @@ gcc-gcj_package() {
} }
gcc-fortran_package() { gcc-fortran_package() {
lib32disabled=yes
depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}" depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}"
short_desc="GCC Fortran compiler frontend" short_desc="GCC Fortran compiler frontend"
pkg_install() { pkg_install() {
@ -173,6 +177,7 @@ gcc-fortran_package() {
} }
gcc-go_package() { gcc-go_package() {
lib32disabled=yes
depends="gcc>=${_majorver} libgo-devel>=${_majorver}" depends="gcc>=${_majorver} libgo-devel>=${_majorver}"
short_desc="GCC Go compiler frontend" short_desc="GCC Go compiler frontend"
pkg_install() { pkg_install() {
@ -188,6 +193,7 @@ gcc-go_package() {
} }
gcc-objc++_package() { gcc-objc++_package() {
lib32disabled=yes
depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}" depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}"
short_desc="GCC Objective-C++ support" short_desc="GCC Objective-C++ support"
pkg_install() { pkg_install() {
@ -196,6 +202,7 @@ gcc-objc++_package() {
} }
gcc-objc_package() { gcc-objc_package() {
lib32disabled=yes
depends="gcc>=${_majorver} libobjc>=${_majorver}" depends="gcc>=${_majorver} libobjc>=${_majorver}"
short_desc="GCC Objective-C support" short_desc="GCC Objective-C support"
pkg_install() { pkg_install() {
@ -385,13 +392,7 @@ libstdc++-devel_package() {
pkg_install() { pkg_install() {
vmove "usr/lib/libstdc++.*a" vmove "usr/lib/libstdc++.*a"
vmove "usr/lib/libsupc++.*" vmove "usr/lib/libsupc++.*"
for f in ${DESTDIR}/usr/include/c++/${_majorver}/*; do vmove usr/include/c++
[ "$(basename $f)" = "${_triplet}" ] && continue
vmove usr/include/c++/${_majorver}/$(basename $f)
done
vmove usr/include/c++/${_majorver}/${_triplet}/bits
cd ${PKGDESTDIR}/usr/include/c++
ln -sf ${_majorver} ${version}
} }
} }
@ -406,6 +407,7 @@ libstdc++_package() {
} }
gcc-c++_package() { gcc-c++_package() {
lib32disabled=yes
depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}" depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}"
short_desc="GCC C++ support" short_desc="GCC C++ support"
pkg_install() { pkg_install() {