gcc: Remove broken no-fortran package .inc files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3590 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
parent
8bc881f6ca
commit
dc87a5f821
|
|
@ -14,6 +14,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
|||
# cross build
|
||||
require gcc4-build-cross.inc
|
||||
# cross packaging
|
||||
require gcc-package-cross-no-fortran.inc
|
||||
require gcc-package-cross.inc
|
||||
|
||||
S = "${WORKDIR}/gcc-2006q1"
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
# Packages emitted by our gcc-cross builds.
|
||||
#
|
||||
INHIBIT_PACKAGE_STRIP ?= ""
|
||||
HAS_G2C ?= "yes"
|
||||
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev"
|
||||
|
||||
# Called from within gcc-cross, so libdir is set wrong
|
||||
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
||||
FILES_libg2c-dev = "${target_libdir}/libg2c.so \
|
||||
${target_libdir}/libg2c.a \
|
||||
${target_libdir}/libfrtbegin.a"
|
||||
|
||||
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
|
||||
|
||||
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
|
||||
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
|
||||
${target_libdir}/libstdc++.so \
|
||||
${target_libdir}/libstdc++.la \
|
||||
${target_libdir}/libstdc++.a \
|
||||
${target_libdir}/libsupc++.la \
|
||||
${target_libdir}/libsupc++.a"
|
||||
|
||||
python do_package() {
|
||||
if bb.data.getVar('DEBIAN_NAMES', d, 1):
|
||||
bb.data.setVar('PKG_libgcc', 'libgcc1', d)
|
||||
bb.build.exec_func('package_do_package', d)
|
||||
}
|
||||
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
|
||||
# Move libgcc_s into /lib
|
||||
mkdir -p ${D}${target_base_libdir}
|
||||
if [ -f ${D}${target_base_libdir}/libgcc_s.so.? ]; then
|
||||
# Already in the right location
|
||||
:
|
||||
elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
|
||||
mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${target_base_libdir}
|
||||
else
|
||||
mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${target_base_libdir}
|
||||
fi
|
||||
|
||||
# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
|
||||
mkdir -p ${D}${target_libdir}
|
||||
mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${target_libdir}
|
||||
if [ "${HAS_G2C}" = "yes" ]; then
|
||||
mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${target_libdir}
|
||||
fi
|
||||
|
||||
# Manually run the target stripper since we won't get it run by
|
||||
# the packaging.
|
||||
if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
|
||||
${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
|
||||
${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.*
|
||||
${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
gcclibdir ?= "${libdir}/gcc"
|
||||
BINV ?= "${PV}"
|
||||
|
||||
# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
|
||||
# packaged in the respective cross packages.
|
||||
PACKAGES = "${PN} ${PN}-symlinks \
|
||||
g++ g++-symlinks \
|
||||
cpp cpp-symlinks \
|
||||
gcov gcov-symlinks \
|
||||
libstdc++-dev libg2c-dev \
|
||||
${PN}-doc"
|
||||
|
||||
FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
|
||||
${bindir}/${TARGET_PREFIX}gccbug \
|
||||
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
|
||||
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/include"
|
||||
FILES_${PN}-symlinks = "${bindir}/cc \
|
||||
${bindir}/gcc \
|
||||
${bindir}/gccbug"
|
||||
|
||||
FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
|
||||
${base_libdir}/cpp"
|
||||
FILES_cpp-symlinks = "${bindir}/cpp"
|
||||
|
||||
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
|
||||
FILES_gcov-symlinks = "${bindir}/gcov"
|
||||
|
||||
# Called from within gcc-cross, so libdir is set wrong
|
||||
FILES_libg2c-dev = "${libdir}/libg2c.so \
|
||||
${libdir}/libg2c.a \
|
||||
${libdir}/libfrtbegin.a"
|
||||
|
||||
FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
|
||||
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
|
||||
FILES_g++-symlinks = "${bindir}/c++ \
|
||||
${bindir}/g++"
|
||||
|
||||
FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
|
||||
${libdir}/libstdc++.so \
|
||||
${libdir}/libstdc++.la \
|
||||
${libdir}/libstdc++.a \
|
||||
${libdir}/libsupc++.la \
|
||||
${libdir}/libsupc++.a"
|
||||
|
||||
FILES_${PN}-doc = "${infodir} \
|
||||
${mandir} \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
|
||||
|
||||
|
||||
do_install () {
|
||||
autotools_do_install
|
||||
|
||||
# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
|
||||
rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
|
||||
rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
|
||||
|
||||
# Hack around specs file assumptions
|
||||
sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs &>/dev/null || true
|
||||
|
||||
# Move libgcc_s into /lib
|
||||
mkdir -p ${D}${base_libdir}
|
||||
mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
|
||||
rm ${D}${libdir}/libgcc_s.so
|
||||
ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
|
||||
| tr -s / \
|
||||
| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
|
||||
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so
|
||||
|
||||
# We don't need libtool libraries
|
||||
rm ${D}${libdir}/libg2c.la &>/dev/null || true
|
||||
|
||||
|
||||
# Cleanup manpages..
|
||||
rm -r ${D}${mandir}/man7
|
||||
|
||||
# We use libiberty from binutils
|
||||
rm ${D}${libdir}/libiberty.a
|
||||
|
||||
cd ${D}${bindir}
|
||||
|
||||
# We care about g++ not c++
|
||||
rm *c++
|
||||
|
||||
# We don't care about the gcc-<version> ones for this
|
||||
rm *gcc-?.?*
|
||||
|
||||
# These sometimes show up, they are strange, we remove them
|
||||
rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
|
||||
|
||||
# Symlinks so we can use these trivially on the target
|
||||
ln -sf ${TARGET_SYS}-g++ g++
|
||||
ln -sf ${TARGET_SYS}-gcc gcc
|
||||
ln -sf g++ c++
|
||||
ln -sf gcc cc
|
||||
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
|
||||
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
|
|||
|
||||
inherit autotools gettext
|
||||
|
||||
require gcc-package-no-fortran.inc
|
||||
require gcc-package.inc
|
||||
|
||||
SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
|
||||
file://gcc-configure-no-fortran.patch;patch=1;pnum=1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue