diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 12:47:30 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 12:47:30 +0000 |
commit | dba2b89720b0318a28ebe7778294873b9353f71d (patch) | |
tree | 9925d056023ab3aae0687bb17ab5fb27e3eaf513 /packages/gcc | |
parent | eea951fc35679b928aedc6214274de67c031ce12 (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p
2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage
2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission
2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.
2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3
2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out.
BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A
Diffstat (limited to 'packages/gcc')
-rw-r--r-- | packages/gcc/gcc-cross_3.3.3.bb | 18 | ||||
-rw-r--r-- | packages/gcc/gcc-cross_3.3.4.bb | 18 | ||||
-rw-r--r-- | packages/gcc/gcc-package.inc | 22 | ||||
-rw-r--r-- | packages/gcc/gcc3-cross-build.inc | 22 | ||||
-rw-r--r-- | packages/gcc/gcc_3.3.3.bb | 24 | ||||
-rw-r--r-- | packages/gcc/gcc_3.3.4.bb | 24 |
6 files changed, 64 insertions, 64 deletions
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index c59ea0d37a..4d1e05457b 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -75,23 +75,23 @@ do_install () { oe_runmake 'DESTDIR=${D}' install # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} + mkdir -p ${D}${base_libdir} if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then # native builds drop one pathname component - mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} else - mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR} + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} # Manually run the target stripper since we won't get it run by # the packaging. - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* } diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 3abf6f0103..997c5044a7 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -76,25 +76,25 @@ do_install () { oe_runmake 'DESTDIR=${D}' install # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} + mkdir -p ${D}${base_libdir} if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then # native builds drop one pathname component - mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} else - mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR} + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} # Manually run the target stripper since we won't get it run by # the packaging. if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* fi } diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 205c40587b..8e776af7b3 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -65,31 +65,31 @@ do_install () { autotools_do_install # Cleanup some of the ${libdir}{,exec}/gcc stuff ... - rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools - rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools + rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools + rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools # Hack around specs file assumptions - sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/specs + sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/specs # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir} - rm ${D}/${libdir}/libgcc_s.so + mkdir -p ${D}${base_libdir} + mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} + rm ${D}${libdir}/libgcc_s.so ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \ | tr -s / \ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \ - ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so + ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so # We don't need libtool libraries - rm ${D}/${libdir}/libg2c.la + rm ${D}${libdir}/libg2c.la # Cleanup manpages.. - rm -r ${D}/${mandir}/man7 + rm -r ${D}${mandir}/man7 # We use libiberty from binutils - rm ${D}/${libdir}/libiberty.a + rm ${D}${libdir}/libiberty.a - cd ${D}/${bindir} + cd ${D}${bindir} # We care about g++ not c++ rm *c++ diff --git a/packages/gcc/gcc3-cross-build.inc b/packages/gcc/gcc3-cross-build.inc index 611b021b11..ef3ae3a6a1 100644 --- a/packages/gcc/gcc3-cross-build.inc +++ b/packages/gcc/gcc3-cross-build.inc @@ -53,27 +53,27 @@ do_install () { oe_runmake 'DESTDIR=${D}' install # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then + mkdir -p ${D}${base_libdir} + if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then # Already in the right location : - elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then - mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir} + elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} else - mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR} + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} # Manually run the target stripper since we won't get it run by # the packaging. if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* fi } diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index f69dedf29b..7f0091a18e 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -157,27 +157,27 @@ do_install () { autotools_do_install # Cleanup some of the gcc-lib stuff - rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools + rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir} - rm -f ${D}/${libdir}/libgcc_s.so + 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.? \ - ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so + ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so # Cleanup manpages.. - rm -rf ${D}/${mandir}/man7 - mv ${D}/${mandir}/man1/cpp.1 \ - ${D}/${mandir}/man1/${TARGET_SYS}-cpp.1 - mv ${D}/${mandir}/man1/gcov.1 \ - ${D}/${mandir}/man1/${TARGET_SYS}-gcov.1 + rm -rf ${D}${mandir}/man7 + mv ${D}${mandir}/man1/cpp.1 \ + ${D}${mandir}/man1/${TARGET_SYS}-cpp.1 + mv ${D}${mandir}/man1/gcov.1 \ + ${D}${mandir}/man1/${TARGET_SYS}-gcov.1 # We use libiberty from binutils - rm -f ${D}/${libdir}/libiberty.a + rm -f ${D}${libdir}/libiberty.a - cd ${D}/${bindir} + cd ${D}${bindir} # We care about g++ not c++ rm -f *c++ diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index c93bda0e7a..dc3a66cd29 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -135,27 +135,27 @@ do_install () { autotools_do_install # Cleanup some of the gcc-lib stuff - rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools + rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir} - rm -f ${D}/${libdir}/libgcc_s.so + 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.? \ - ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so + ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so # Cleanup manpages.. - rm -rf ${D}/${mandir}/man7 - mv ${D}/${mandir}/man1/cpp.1 \ - ${D}/${mandir}/man1/${TARGET_SYS}-cpp.1 - mv ${D}/${mandir}/man1/gcov.1 \ - ${D}/${mandir}/man1/${TARGET_SYS}-gcov.1 + rm -rf ${D}${mandir}/man7 + mv ${D}${mandir}/man1/cpp.1 \ + ${D}${mandir}/man1/${TARGET_SYS}-cpp.1 + mv ${D}${mandir}/man1/gcov.1 \ + ${D}${mandir}/man1/${TARGET_SYS}-gcov.1 # We use libiberty from binutils - rm -f ${D}/${libdir}/libiberty.a + rm -f ${D}${libdir}/libiberty.a - cd ${D}/${bindir} + cd ${D}${bindir} # We care about g++ not c++ rm -f *c++ |