mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
gcc: Remove bogus PACKAGE_ARCH settings (now fixed properly in cross.bbclass)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@982 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -7,20 +7,14 @@ INHIBIT_PACKAGE_STRIP = "1"
|
|||||||
|
|
||||||
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev"
|
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev"
|
||||||
|
|
||||||
PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
|
|
||||||
|
|
||||||
# Called from within gcc-cross, so libdir is set wrong
|
# Called from within gcc-cross, so libdir is set wrong
|
||||||
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
||||||
FILES_libg2c-dev = "${target_libdir}/libg2c.so \
|
FILES_libg2c-dev = "${target_libdir}/libg2c.so \
|
||||||
${target_libdir}/libg2c.a \
|
${target_libdir}/libg2c.a \
|
||||||
${target_libdir}/libfrtbegin.a"
|
${target_libdir}/libfrtbegin.a"
|
||||||
|
|
||||||
PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
|
|
||||||
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
|
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
|
||||||
|
|
||||||
PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
|
|
||||||
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
|
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
|
||||||
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
|
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
|
||||||
${target_libdir}/libstdc++.so \
|
${target_libdir}/libstdc++.so \
|
||||||
|
|||||||
@@ -8,11 +8,6 @@ INHIBIT_PACKAGE_STRIP = "1"
|
|||||||
|
|
||||||
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
|
PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
|
||||||
|
|
||||||
PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libgfortran = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libgfortran-dev = "${TARGET_ARCH}"
|
|
||||||
|
|
||||||
# Called from within gcc-cross, so libdir is set wrong
|
# Called from within gcc-cross, so libdir is set wrong
|
||||||
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
||||||
FILES_libg2c-dev = "${target_libdir}/libg2c.so \
|
FILES_libg2c-dev = "${target_libdir}/libg2c.so \
|
||||||
@@ -24,11 +19,8 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
|
|||||||
${target_libdir}/libgfortran.so \
|
${target_libdir}/libgfortran.so \
|
||||||
${target_libdir}/libgfortranbegin.a"
|
${target_libdir}/libgfortranbegin.a"
|
||||||
|
|
||||||
PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
|
|
||||||
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
|
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
|
||||||
|
|
||||||
PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
|
|
||||||
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
|
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
|
||||||
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
|
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
|
||||||
${target_libdir}/libstdc++.so \
|
${target_libdir}/libstdc++.so \
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ FILES_cpp-symlinks = "${bindir}/cpp"
|
|||||||
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
|
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
|
||||||
FILES_gcov-symlinks = "${bindir}/gcov"
|
FILES_gcov-symlinks = "${bindir}/gcov"
|
||||||
|
|
||||||
PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
|
|
||||||
# Called from within gcc-cross, so libdir is set wrong
|
# Called from within gcc-cross, so libdir is set wrong
|
||||||
FILES_libg2c-dev = "${libdir}/libg2c.so \
|
FILES_libg2c-dev = "${libdir}/libg2c.so \
|
||||||
${libdir}/libg2c.a \
|
${libdir}/libg2c.a \
|
||||||
@@ -40,7 +39,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
|
|||||||
FILES_g++-symlinks = "${bindir}/c++ \
|
FILES_g++-symlinks = "${bindir}/c++ \
|
||||||
${bindir}/g++"
|
${bindir}/g++"
|
||||||
|
|
||||||
PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
|
|
||||||
FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
|
FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
|
||||||
${libdir}/libstdc++.so \
|
${libdir}/libstdc++.so \
|
||||||
${libdir}/libstdc++.la \
|
${libdir}/libstdc++.la \
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ FILES_cpp-symlinks = "${bindir}/cpp"
|
|||||||
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
|
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
|
||||||
FILES_gcov-symlinks = "${bindir}/gcov"
|
FILES_gcov-symlinks = "${bindir}/gcov"
|
||||||
|
|
||||||
PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
|
|
||||||
# Called from within gcc-cross, so libdir is set wrong
|
# Called from within gcc-cross, so libdir is set wrong
|
||||||
FILES_libg2c-dev = "${libdir}/libg2c.so \
|
FILES_libg2c-dev = "${libdir}/libg2c.so \
|
||||||
${libdir}/libg2c.a \
|
${libdir}/libg2c.a \
|
||||||
@@ -46,7 +45,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
|
|||||||
FILES_g++-symlinks = "${bindir}/c++ \
|
FILES_g++-symlinks = "${bindir}/c++ \
|
||||||
${bindir}/g++"
|
${bindir}/g++"
|
||||||
|
|
||||||
PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
|
|
||||||
FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
|
FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
|
||||||
${libdir}/libstdc++.so \
|
${libdir}/libstdc++.so \
|
||||||
${libdir}/libstdc++.la \
|
${libdir}/libstdc++.la \
|
||||||
|
|||||||
@@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
|
|||||||
FILES_${PN}-c++-symlinks = "${bindir}/c++ \
|
FILES_${PN}-c++-symlinks = "${bindir}/c++ \
|
||||||
${bindir}/g++"
|
${bindir}/g++"
|
||||||
|
|
||||||
PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
|
|
||||||
FILES_libgcc = "/lib/libgcc_s.so.*"
|
FILES_libgcc = "/lib/libgcc_s.so.*"
|
||||||
|
|
||||||
PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
|
|
||||||
PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
|
|
||||||
# Called from within gcc-cross, so libdir is set wrong
|
# Called from within gcc-cross, so libdir is set wrong
|
||||||
#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
|
#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
|
||||||
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
|
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
|
||||||
|
|||||||
Reference in New Issue
Block a user