diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-11-29 13:59:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-29 13:59:00 +0000 |
| commit | c7c86e2bba138383b6ff9111e201e984b7e229aa (patch) | |
| tree | e9c38455ac24af6a865aa7e436e476562ac05137 /meta | |
| parent | 34aa4cad3de49aaf925a70807e9ccedc81d22d07 (diff) | |
| download | openembedded-core-c7c86e2bba138383b6ff9111e201e984b7e229aa.tar.gz openembedded-core-c7c86e2bba138383b6ff9111e201e984b7e229aa.tar.bz2 openembedded-core-c7c86e2bba138383b6ff9111e201e984b7e229aa.zip | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/gcc/gcc-package-cross-no-fortran.inc | 6 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-package-cross.inc | 8 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-package-no-fortran.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-package.inc | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc_3.3.4.bb | 3 |
5 files changed, 0 insertions, 21 deletions
diff --git a/meta/packages/gcc/gcc-package-cross-no-fortran.inc b/meta/packages/gcc/gcc-package-cross-no-fortran.inc index 3548c0bb8e..1ce7def547 100644 --- a/meta/packages/gcc/gcc-package-cross-no-fortran.inc +++ b/meta/packages/gcc/gcc-package-cross-no-fortran.inc @@ -7,20 +7,14 @@ INHIBIT_PACKAGE_STRIP = "1" 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 FILES_libg2c = "${target_libdir}/libg2c.so.*" FILES_libg2c-dev = "${target_libdir}/libg2c.so \ ${target_libdir}/libg2c.a \ ${target_libdir}/libfrtbegin.a" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" 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++-dev = "${target_includedir}/c++/${PV} \ ${target_libdir}/libstdc++.so \ diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc index 4b1f8f68e8..1ea15c2133 100644 --- a/meta/packages/gcc/gcc-package-cross.inc +++ b/meta/packages/gcc/gcc-package-cross.inc @@ -8,11 +8,6 @@ INHIBIT_PACKAGE_STRIP = "1" 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 FILES_libg2c = "${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}/libgfortranbegin.a" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" 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++-dev = "${target_includedir}/c++/${PV} \ ${target_libdir}/libstdc++.so \ diff --git a/meta/packages/gcc/gcc-package-no-fortran.inc b/meta/packages/gcc/gcc-package-no-fortran.inc index a5b5ad867a..cf3e9ed0bf 100644 --- a/meta/packages/gcc/gcc-package-no-fortran.inc +++ b/meta/packages/gcc/gcc-package-no-fortran.inc @@ -29,7 +29,6 @@ FILES_cpp-symlinks = "${bindir}/cpp" FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" FILES_gcov-symlinks = "${bindir}/gcov" -PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c-dev = "${libdir}/libg2c.so \ ${libdir}/libg2c.a \ @@ -40,7 +39,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_g++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++.la \ diff --git a/meta/packages/gcc/gcc-package.inc b/meta/packages/gcc/gcc-package.inc index 4dcc72e879..7dbb2acc35 100644 --- a/meta/packages/gcc/gcc-package.inc +++ b/meta/packages/gcc/gcc-package.inc @@ -35,7 +35,6 @@ FILES_cpp-symlinks = "${bindir}/cpp" FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" FILES_gcov-symlinks = "${bindir}/gcov" -PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c-dev = "${libdir}/libg2c.so \ ${libdir}/libg2c.a \ @@ -46,7 +45,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_g++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++.la \ diff --git a/meta/packages/gcc/gcc_3.3.4.bb b/meta/packages/gcc/gcc_3.3.4.bb index e49316c768..00adcac3ec 100644 --- a/meta/packages/gcc/gcc_3.3.4.bb +++ b/meta/packages/gcc/gcc_3.3.4.bb @@ -37,11 +37,8 @@ FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ ${bindir}/g++" -PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" 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 #FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++ = "${libdir}/libstdc++.so.*" |