diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/gcc/gcc_3.3.4.bb | |
parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.
2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting.
2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.
2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded
2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references. As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.
2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.
BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg
Diffstat (limited to 'packages/gcc/gcc_3.3.4.bb')
-rw-r--r-- | packages/gcc/gcc_3.3.4.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index 4258d58476..c93bda0e7a 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -45,7 +45,7 @@ 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.*" +FILES_libstdc++ = "${libdir}/libstdc++.so.*" FILES_libstdc++-dev = "${includedir}/c++/${PV} \ ${libdir}/libstdc++.so \ @@ -138,8 +138,8 @@ do_install () { rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools # Move libgcc_s into /lib - mkdir -p ${D}/lib - mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/lib + mkdir -p ${D}/${base_libdir} + mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir} rm -f ${D}/${libdir}/libgcc_s.so ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \ |