diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-24 00:40:16 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-24 00:40:16 +0000 |
| commit | 07343454b40e862030a153c83e16db3b40c21b2d (patch) | |
| tree | c15598e3b57587ab4df4284a49915ddbd8dd6e8a | |
| parent | 0c743563731861deacbfa8ace5e3f51824877006 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages-devel
into hyperion.kergoth.com:/home/kergoth/code/packages
2004/11/23 18:40:15-06:00 ti.com!kergoth
Unbork libg2c and libstdc++ packaging in the gcc-cross builds of gcc 3.4.x.
BKrev: 41a3d870OJsYJbDWku7CEKNQwY_zZQ
| -rw-r--r-- | gcc/gcc-package.inc | 22 | ||||
| -rw-r--r-- | gcc/gcc_3.4.0.oe | 2 | ||||
| -rw-r--r-- | gcc/gcc_3.4.1.oe | 2 | ||||
| -rw-r--r-- | gcc/gcc_3.4.2.oe | 2 | ||||
| -rw-r--r-- | gcc/gcc_3.4.3.oe | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/gcc/gcc-package.inc b/gcc/gcc-package.inc index 9bc6b1d3a0..2f43451af1 100644 --- a/gcc/gcc-package.inc +++ b/gcc/gcc-package.inc @@ -30,10 +30,10 @@ FILES_${PN}-f77-symlinks = "${bindir}/g77 \ ${bindir}/f77" # Called from within gcc-cross, so libdir is set wrong -FILES_libg2c = "${libdir}/libg2c.so.*" -FILES_libg2c-dev = "${libdir}/libg2c.so \ - ${libdir}/libg2c.a \ - ${libdir}/libfrtbegin.a" +FILES_libg2c = "/usr/lib/libg2c.so.*" +FILES_libg2c-dev = "/usr/lib/libg2c.so \ + /usr/lib/libg2c.a \ + /usr/lib/libfrtbegin.a" FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \ ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1plus" @@ -43,13 +43,13 @@ FILES_${PN}-c++-symlinks = "${bindir}/c++ \ FILES_libgcc = "/lib/libgcc_s.so.1" # Called from within gcc-cross, so libdir is set wrong -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "${includedir}/c++/${PV} \ - ${libdir}/libstdc++.so \ - ${libdir}/libstdc++.la \ - ${libdir}/libstdc++.a \ - ${libdir}/libsupc++.la \ - ${libdir}/libsupc++.a" +FILES_libstdc++ = "/usr/lib/libstdc++.so.*" +FILES_libstdc++-dev = "/usr/include/c++/${PV} \ + /usr/lib/libstdc++.so \ + /usr/lib/libstdc++.la \ + /usr/lib/libstdc++.a \ + /usr/lib/libsupc++.la \ + /usr/lib/libsupc++.a" FILES_${PN}-doc = "${infodir} \ ${mandir} \ diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe index 61fd3cba3a..635c8c3ef4 100644 --- a/gcc/gcc_3.4.0.oe +++ b/gcc/gcc_3.4.0.oe @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/gcc/gcc_3.4.1.oe b/gcc/gcc_3.4.1.oe index 61fd3cba3a..635c8c3ef4 100644 --- a/gcc/gcc_3.4.1.oe +++ b/gcc/gcc_3.4.1.oe @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/gcc/gcc_3.4.2.oe b/gcc/gcc_3.4.2.oe index 61fd3cba3a..635c8c3ef4 100644 --- a/gcc/gcc_3.4.2.oe +++ b/gcc/gcc_3.4.2.oe @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/gcc/gcc_3.4.3.oe b/gcc/gcc_3.4.3.oe index 9445be099b..01592641cb 100644 --- a/gcc/gcc_3.4.3.oe +++ b/gcc/gcc_3.4.3.oe @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" |