diff options
| -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" | |||
| 7 | 7 | ||
| 8 | PACKAGES = "libgcc libstdc++ libg2c libg2c-dev" | 8 | PACKAGES = "libgcc libstdc++ libg2c libg2c-dev" |
| 9 | 9 | ||
| 10 | PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" | ||
| 11 | PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" | ||
| 12 | |||
| 13 | # Called from within gcc-cross, so libdir is set wrong | 10 | # Called from within gcc-cross, so libdir is set wrong |
| 14 | FILES_libg2c = "${target_libdir}/libg2c.so.*" | 11 | FILES_libg2c = "${target_libdir}/libg2c.so.*" |
| 15 | FILES_libg2c-dev = "${target_libdir}/libg2c.so \ | 12 | FILES_libg2c-dev = "${target_libdir}/libg2c.so \ |
| 16 | ${target_libdir}/libg2c.a \ | 13 | ${target_libdir}/libg2c.a \ |
| 17 | ${target_libdir}/libfrtbegin.a" | 14 | ${target_libdir}/libfrtbegin.a" |
| 18 | 15 | ||
| 19 | PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" | ||
| 20 | FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" | 16 | FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" |
| 21 | 17 | ||
| 22 | PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" | ||
| 23 | PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" | ||
| 24 | FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" | 18 | FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" |
| 25 | FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ | 19 | FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ |
| 26 | ${target_libdir}/libstdc++.so \ | 20 | ${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" | |||
| 8 | 8 | ||
| 9 | PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" | 9 | PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" |
| 10 | 10 | ||
| 11 | PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" | ||
| 12 | PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" | ||
| 13 | PACKAGE_ARCH_libgfortran = "${TARGET_ARCH}" | ||
| 14 | PACKAGE_ARCH_libgfortran-dev = "${TARGET_ARCH}" | ||
| 15 | |||
| 16 | # Called from within gcc-cross, so libdir is set wrong | 11 | # Called from within gcc-cross, so libdir is set wrong |
| 17 | FILES_libg2c = "${target_libdir}/libg2c.so.*" | 12 | FILES_libg2c = "${target_libdir}/libg2c.so.*" |
| 18 | FILES_libg2c-dev = "${target_libdir}/libg2c.so \ | 13 | FILES_libg2c-dev = "${target_libdir}/libg2c.so \ |
| @@ -24,11 +19,8 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \ | |||
| 24 | ${target_libdir}/libgfortran.so \ | 19 | ${target_libdir}/libgfortran.so \ |
| 25 | ${target_libdir}/libgfortranbegin.a" | 20 | ${target_libdir}/libgfortranbegin.a" |
| 26 | 21 | ||
| 27 | PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" | ||
| 28 | FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" | 22 | FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" |
| 29 | 23 | ||
| 30 | PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" | ||
| 31 | PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" | ||
| 32 | FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" | 24 | FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" |
| 33 | FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ | 25 | FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ |
| 34 | ${target_libdir}/libstdc++.so \ | 26 | ${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" | |||
| 29 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" | 29 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" |
| 30 | FILES_gcov-symlinks = "${bindir}/gcov" | 30 | FILES_gcov-symlinks = "${bindir}/gcov" |
| 31 | 31 | ||
| 32 | PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" | ||
| 33 | # Called from within gcc-cross, so libdir is set wrong | 32 | # Called from within gcc-cross, so libdir is set wrong |
| 34 | FILES_libg2c-dev = "${libdir}/libg2c.so \ | 33 | FILES_libg2c-dev = "${libdir}/libg2c.so \ |
| 35 | ${libdir}/libg2c.a \ | 34 | ${libdir}/libg2c.a \ |
| @@ -40,7 +39,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ | |||
| 40 | FILES_g++-symlinks = "${bindir}/c++ \ | 39 | FILES_g++-symlinks = "${bindir}/c++ \ |
| 41 | ${bindir}/g++" | 40 | ${bindir}/g++" |
| 42 | 41 | ||
| 43 | PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" | ||
| 44 | FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ | 42 | FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ |
| 45 | ${libdir}/libstdc++.so \ | 43 | ${libdir}/libstdc++.so \ |
| 46 | ${libdir}/libstdc++.la \ | 44 | ${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" | |||
| 35 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" | 35 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" |
| 36 | FILES_gcov-symlinks = "${bindir}/gcov" | 36 | FILES_gcov-symlinks = "${bindir}/gcov" |
| 37 | 37 | ||
| 38 | PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" | ||
| 39 | # Called from within gcc-cross, so libdir is set wrong | 38 | # Called from within gcc-cross, so libdir is set wrong |
| 40 | FILES_libg2c-dev = "${libdir}/libg2c.so \ | 39 | FILES_libg2c-dev = "${libdir}/libg2c.so \ |
| 41 | ${libdir}/libg2c.a \ | 40 | ${libdir}/libg2c.a \ |
| @@ -46,7 +45,6 @@ FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \ | |||
| 46 | FILES_g++-symlinks = "${bindir}/c++ \ | 45 | FILES_g++-symlinks = "${bindir}/c++ \ |
| 47 | ${bindir}/g++" | 46 | ${bindir}/g++" |
| 48 | 47 | ||
| 49 | PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" | ||
| 50 | FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ | 48 | FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ |
| 51 | ${libdir}/libstdc++.so \ | 49 | ${libdir}/libstdc++.so \ |
| 52 | ${libdir}/libstdc++.la \ | 50 | ${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++ \ | |||
| 37 | FILES_${PN}-c++-symlinks = "${bindir}/c++ \ | 37 | FILES_${PN}-c++-symlinks = "${bindir}/c++ \ |
| 38 | ${bindir}/g++" | 38 | ${bindir}/g++" |
| 39 | 39 | ||
| 40 | PACKAGE_ARCH_libgcc = "${TARGET_ARCH}" | ||
| 41 | FILES_libgcc = "/lib/libgcc_s.so.*" | 40 | FILES_libgcc = "/lib/libgcc_s.so.*" |
| 42 | 41 | ||
| 43 | PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" | ||
| 44 | PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" | ||
| 45 | # Called from within gcc-cross, so libdir is set wrong | 42 | # Called from within gcc-cross, so libdir is set wrong |
| 46 | #FILES_libstdc++ = "${libdir}/libstdc++.so.*" | 43 | #FILES_libstdc++ = "${libdir}/libstdc++.so.*" |
| 47 | FILES_libstdc++ = "${libdir}/libstdc++.so.*" | 44 | FILES_libstdc++ = "${libdir}/libstdc++.so.*" |
