diff options
| -rw-r--r-- | classes/package.oeclass | 2 | ||||
| -rw-r--r-- | conf/oe.conf | 2 | ||||
| -rw-r--r-- | gcc/gcc-package.inc | 5 | ||||
| -rw-r--r-- | gcc/gcc_3.3.3.oe | 3 | ||||
| -rw-r--r-- | gcc/gcc_3.3.4.oe | 3 |
5 files changed, 13 insertions, 2 deletions
diff --git a/classes/package.oeclass b/classes/package.oeclass index fbd3fbb39a..d1b0562c2d 100644 --- a/classes/package.oeclass +++ b/classes/package.oeclass @@ -77,7 +77,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst oe.data.setVar('PACKAGES', ' '.join(packages), d) python populate_packages () { - import glob, stat, errno, re + import glob, stat, errno, re, copy workdir = oe.data.getVar('WORKDIR', d, 1) if not workdir: diff --git a/conf/oe.conf b/conf/oe.conf index 2ecbaf7ada..06932b0a27 100644 --- a/conf/oe.conf +++ b/conf/oe.conf @@ -44,7 +44,7 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" -PACKAGE_ARCH = "${TARGET_ARCH}" +PACKAGE_ARCH = "${HOST_ARCH}" MACHINE_ARCH = "${MACHINE}" ################################################################## diff --git a/gcc/gcc-package.inc b/gcc/gcc-package.inc index 2f43451af1..b62cd34621 100644 --- a/gcc/gcc-package.inc +++ b/gcc/gcc-package.inc @@ -29,6 +29,8 @@ FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \ FILES_${PN}-f77-symlinks = "${bindir}/g77 \ ${bindir}/f77" +PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" +PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "/usr/lib/libg2c.so.*" FILES_libg2c-dev = "/usr/lib/libg2c.so \ @@ -40,8 +42,11 @@ 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.1" +PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}" +PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}" # Called from within gcc-cross, so libdir is set wrong FILES_libstdc++ = "/usr/lib/libstdc++.so.*" FILES_libstdc++-dev = "/usr/include/c++/${PV} \ diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe index 9f9438b496..e9e80a3906 100644 --- a/gcc/gcc_3.3.3.oe +++ b/gcc/gcc_3.3.3.oe @@ -38,8 +38,11 @@ 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++ = "/usr/lib/libstdc++.so.*" diff --git a/gcc/gcc_3.3.4.oe b/gcc/gcc_3.3.4.oe index 9670a8097f..464f3901e9 100644 --- a/gcc/gcc_3.3.4.oe +++ b/gcc/gcc_3.3.4.oe @@ -38,8 +38,11 @@ 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++ = "/usr/lib/libstdc++.so.*" |