diff options
Diffstat (limited to 'packages')
26 files changed, 57 insertions, 336 deletions
diff --git a/packages/gcc/gcc-cross-initial.inc b/packages/gcc/gcc-cross-initial.inc new file mode 100644 index 0000000000..49e1937b06 --- /dev/null +++ b/packages/gcc/gcc-cross-initial.inc @@ -0,0 +1,25 @@ +DEPENDS = "virtual/${TARGET_PREFIX}binutils" +DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" +PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" +PACKAGES = "" + +# This is intended to be a -very- basic config +EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ + --with-newlib \ + --disable-shared \ + --disable-threads \ + --disable-multilib \ + --disable-__cxa_atexit \ + --enable-languages=c \ + --enable-target-optspace \ + --program-prefix=${TARGET_PREFIX} \ + ${@get_gcc_fpu_setting(bb, d)}" + +do_stage_prepend () { + mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} + ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a +} + +do_install () { + : +} diff --git a/packages/gcc/gcc-cross-initial_3.3.3.bb b/packages/gcc/gcc-cross-initial_3.3.3.bb index 4fccaf3888..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_3.3.3.bb +++ b/packages/gcc/gcc-cross-initial_3.3.3.bb @@ -1,29 +1,2 @@ -SECTION = "devel" require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb index 4fccaf3888..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -1,29 +1,2 @@ -SECTION = "devel" require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb index 307c6f7d4c..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_3.4.3.bb +++ b/packages/gcc/gcc-cross-initial_3.4.3.bb @@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb index 307c6f7d4c..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_3.4.4.bb +++ b/packages/gcc/gcc-cross-initial_3.4.4.bb @@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb index 037f3032a6..70877fe626 100644 --- a/packages/gcc/gcc-cross-initial_4.0.2.bb +++ b/packages/gcc/gcc-cross-initial_4.0.2.bb @@ -1,29 +1,4 @@ require gcc-cross_${PV}.bb +require gcc-cross-initial.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +EXTRA_OECONF += "--disable-multilib" diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb index 1e23ef9330..1c1d094382 100644 --- a/packages/gcc/gcc-cross-initial_4.1.0.bb +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb +require gcc-cross-initial.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --disable-libssp \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +EXTRA_OECONF += "--disable-libmudflap \ + --disable-libssp" diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb index 1e23ef9330..1c1d094382 100644 --- a/packages/gcc/gcc-cross-initial_4.1.1.bb +++ b/packages/gcc/gcc-cross-initial_4.1.1.bb @@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb +require gcc-cross-initial.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --disable-libssp \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +EXTRA_OECONF += "--disable-libmudflap \ + --disable-libssp" diff --git a/packages/gcc/gcc-cross-initial_4.1.2.bb b/packages/gcc/gcc-cross-initial_4.1.2.bb index 1e23ef9330..1c1d094382 100644 --- a/packages/gcc/gcc-cross-initial_4.1.2.bb +++ b/packages/gcc/gcc-cross-initial_4.1.2.bb @@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb +require gcc-cross-initial.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --disable-libssp \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +EXTRA_OECONF += "--disable-libmudflap \ + --disable-libssp" diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb index 1e23ef9330..1c1d094382 100644 --- a/packages/gcc/gcc-cross-initial_4.2.1.bb +++ b/packages/gcc/gcc-cross-initial_4.2.1.bb @@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb +require gcc-cross-initial.inc -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --disable-libmudflap \ - --disable-libssp \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +EXTRA_OECONF += "--disable-libmudflap \ + --disable-libssp" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb index 307c6f7d4c..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb @@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb index 307c6f7d4c..1639511362 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb @@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb - -DEPENDS = "virtual/${TARGET_PREFIX}binutils" -DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -# This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-newlib \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --enable-target-optspace \ - --program-prefix=${TARGET_PREFIX} \ - ${@get_gcc_fpu_setting(bb, d)}" - -do_stage_prepend () { - mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} - ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a -} - -# Override the method from gcc-cross so we don't try to install libgcc -do_install () { - oe_runmake 'DESTDIR=${D}' install -} +require gcc-cross-initial.inc diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 4e380c5f66..0d3e5de6f4 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r1" +PR = "r2" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 08bc3a836e..b9267f7973 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r12" +PR = "r13" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 34f083b111..e67d6c6b7a 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r7" +PR = "r8" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index 9433c237f4..003fd9e79e 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r5" +PR = "r6" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index a7a4908120..fa1b1247f5 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -1,8 +1,6 @@ # Packages emitted by our gcc-cross builds. # INHIBIT_PACKAGE_STRIP ?= "" -HAS_G2C ?= "yes" -HAS_GFORTRAN ?= "no" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" @@ -53,12 +51,8 @@ do_install () { # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr mkdir -p ${D}${target_libdir} mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} - if [ "${HAS_G2C}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true - fi - if [ "${HAS_GFORTRAN}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} - fi + mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true # Manually run the target stripper since we won't get it run by # the packaging. @@ -66,5 +60,6 @@ do_install () { ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* - fi + ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true + fi } diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc index a910a8dc4d..c3ba231678 100644 --- a/packages/gcc/gcc-package-sdk.inc +++ b/packages/gcc/gcc-package-sdk.inc @@ -1,8 +1,6 @@ # Packages emitted by our gcc-cross builds. # INHIBIT_PACKAGE_STRIP ?= "" -HAS_G2C ?= "yes" -HAS_GFORTRAN ?= "no" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/packages/gcc/gcc4-build.inc b/packages/gcc/gcc4-build.inc index b8a214a590..f745ad22ab 100644 --- a/packages/gcc/gcc4-build.inc +++ b/packages/gcc/gcc4-build.inc @@ -1,6 +1,4 @@ FORTRAN = ",f95" -HAS_GFORTRAN ?= "yes" -HAS_G2C = "no" include gcc3-build.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index 0541ddfe96..1d7d8242fe 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -35,5 +35,3 @@ require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" -HAS_GFORTRAN = "" -HAS_G2C = "no" diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 47253cc8d5..3a4eaf9d3b 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -21,7 +21,5 @@ require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" -HAS_GFORTRAN = "" -HAS_G2C = "no" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 9135daca18..1a03ce617e 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -46,8 +46,6 @@ SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \ #Set the fortran bits # 'fortran' or '', not 'f77' like gcc3 had FORTRAN = "" -HAS_GFORTRAN = "no" -HAS_G2C = "no" #Set the java bits JAVA_arm = "" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 9e05ae638c..5d01163d94 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -38,10 +38,6 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits # ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" -FORTRAN_linux-gnueabi = ",fortran" -HAS_GFORTRAN = "no" -HAS_GFORTRAN_linux-gnueabi = "yes" -HAS_G2C = "yes" #Set the java bits JAVA = "" diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index a4ac7a99a4..07f4b0db0c 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -64,9 +64,6 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " # 'i,fortran' or '', not 'f77' like gcc3 had FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" -HAS_GFORTRAN = "no" -HAS_GFORTRAN_linux-gnueabi = "yes" -HAS_G2C = "yes" #Set the java bits JAVA = "" diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 37ba2e6698..24eb54a9b4 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -6,7 +6,7 @@ PACKAGES_DYNAMIC = "gst-plugin-*" SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl" +EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} " acpaths = "-I ${S}/common/m4 -I ${S}/m4" diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 16d5f0e2e6..efdaaaa06a 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -6,10 +6,11 @@ RPROVIDES_${PN} = matchbox-keyboard #DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \ + file://smallscreen-fontsize.patch;patch=1 \ + file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \ file://80matchboxkeyboard \ file://matchbox-keyboard-hide-delay.patch;patch=1" |