[oe-commits] org.oe.dev merge of '4cb57a7e78a706388906290afb6ab438e669072a'
oe commit
oe at amethyst.openembedded.net
Mon Mar 17 09:01:12 UTC 2008
merge of '4cb57a7e78a706388906290afb6ab438e669072a'
and '6e0de74e2cca9def0790de8f3cd7446e3df6ea12'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 14530086af965bcc333fe32ea5cf9a9ff053a0a1
ViewMTN: http://monotone.openembedded.org/revision/info/14530086af965bcc333fe32ea5cf9a9ff053a0a1
Files:
1
packages/xorg-app/xset_1.0.4.bb
packages/xorg-driver/xf86-input-aiptek_1.1.1.bb
packages/xorg-driver/xf86-video-nv_2.1.8.bb
packages/xorg-font/font-xfree86-type1_1.0.1.bb
packages/xorg-lib/xtrans_1.1.bb
packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm.bb
packages/gcc/gcc-csl-arm-cvs.inc
packages/gcc/gcc-csl-arm.inc
packages/gcc/gcc_csl-arm-cvs.bb
packages/gcc/gcc_csl-arm.bb
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-cross_3.3.3.bb
packages/gcc/gcc_4.2.2.bb
Diffs:
#
# mt diff -r4cb57a7e78a706388906290afb6ab438e669072a -r14530086af965bcc333fe32ea5cf9a9ff053a0a1
#
#
#
# add_file "packages/xorg-app/xset_1.0.4.bb"
# content [613b01cfd6f7c90e7cacc546418ad33c62e6e876]
#
# add_file "packages/xorg-driver/xf86-input-aiptek_1.1.1.bb"
# content [b99981280d7ecee88f77dd0a230178dc485cd943]
#
# add_file "packages/xorg-driver/xf86-video-nv_2.1.8.bb"
# content [279f389bebf36784ac5d86be9734b6f7b2d2fc1d]
#
# add_file "packages/xorg-font/font-xfree86-type1_1.0.1.bb"
# content [bf2baa9b38d3d172955d14e68ca7629be58a45c3]
#
# add_file "packages/xorg-lib/xtrans_1.1.bb"
# content [5adfa3a5c753b71a9a61e266569ccbd26e940b09]
#
============================================================
--- packages/xorg-app/xset_1.0.4.bb 613b01cfd6f7c90e7cacc546418ad33c62e6e876
+++ packages/xorg-app/xset_1.0.4.bb 613b01cfd6f7c90e7cacc546418ad33c62e6e876
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
============================================================
--- packages/xorg-driver/xf86-input-aiptek_1.1.1.bb b99981280d7ecee88f77dd0a230178dc485cd943
+++ packages/xorg-driver/xf86-input-aiptek_1.1.1.bb b99981280d7ecee88f77dd0a230178dc485cd943
@@ -0,0 +1,2 @@
+require xorg-driver-input.inc
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-video-nv_2.1.8.bb 279f389bebf36784ac5d86be9734b6f7b2d2fc1d
+++ packages/xorg-driver/xf86-video-nv_2.1.8.bb 279f389bebf36784ac5d86be9734b6f7b2d2fc1d
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
============================================================
--- packages/xorg-font/font-xfree86-type1_1.0.1.bb bf2baa9b38d3d172955d14e68ca7629be58a45c3
+++ packages/xorg-font/font-xfree86-type1_1.0.1.bb bf2baa9b38d3d172955d14e68ca7629be58a45c3
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
============================================================
--- packages/xorg-lib/xtrans_1.1.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09
+++ packages/xorg-lib/xtrans_1.1.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+
+SRC_URI += "file://fix-missing-includepath.patch;patch=1"
#
# mt diff -r6e0de74e2cca9def0790de8f3cd7446e3df6ea12 -r14530086af965bcc333fe32ea5cf9a9ff053a0a1
#
#
#
# delete "packages/gcc/gcc-cross-initial_csl-arm-cvs.bb"
#
# delete "packages/gcc/gcc-cross_csl-arm-cvs.bb"
#
# delete "packages/gcc/gcc-cross_csl-arm.bb"
#
# delete "packages/gcc/gcc-csl-arm-cvs.inc"
#
# delete "packages/gcc/gcc-csl-arm.inc"
#
# delete "packages/gcc/gcc_csl-arm-cvs.bb"
#
# delete "packages/gcc/gcc_csl-arm.bb"
#
# patch "packages/gcc/gcc-4.2.2.inc"
# from [53337ebeeae40f12bc9688296c20c72a7b316d7c]
# to [13e6aba7d5ee47a5289255ca43b3892e63cf0ebd]
#
# patch "packages/gcc/gcc-cross_3.3.3.bb"
# from [8a0e110565b535ecfafa2046bae44016fbe8e61b]
# to [38620c97f258fcf7a106d748386c80999510aebe]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [42d5c902e1d49069638f74263bf71864be52f3c5]
# to [f29bf48a3d25ed2aca4c7a48402687e66a222580]
#
============================================================
--- packages/gcc/gcc-4.2.2.inc 53337ebeeae40f12bc9688296c20c72a7b316d7c
+++ packages/gcc/gcc-4.2.2.inc 13e6aba7d5ee47a5289255ca43b3892e63cf0ebd
@@ -77,12 +77,5 @@ ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_
require gcc3-build.inc
ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
-
EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
-# We know some one is including us, but we only want to apply this fortran hack for the real gcc
-python __anonymous () {
- import bb
- if bb.data.getVar('PN', d, True) == "gcc":
- bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
-}
============================================================
--- packages/gcc/gcc-cross_3.3.3.bb 8a0e110565b535ecfafa2046bae44016fbe8e61b
+++ packages/gcc/gcc-cross_3.3.3.bb 38620c97f258fcf7a106d748386c80999510aebe
@@ -1,16 +1,9 @@ require gcc-${PV}.inc
PR = "r3"
require gcc-${PV}.inc
-require gcc-package-target.inc
-inherit cross
+require gcc-cross.inc
+require gcc-package-cross.inc
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# Files for these are defined in the main gcc.oe
-PACKAGES = "libgcc libstdc++ libg2c"
-INHIBIT_PACKAGE_STRIP = "1"
-
EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
@@ -61,34 +54,3 @@ do_stage_append () {
# We don't really need to keep this around
rm -rf ${CROSS_DIR}/share
}
-
-python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libgcc', 'libgcc1', d)
- bb.build.exec_func('package_do_package', d)
-}
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-
- # Move libgcc_s into /lib
- 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}
- else
- 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}
-
- # 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.*
-}
============================================================
--- packages/gcc/gcc_4.2.2.bb 42d5c902e1d49069638f74263bf71864be52f3c5
+++ packages/gcc/gcc_4.2.2.bb f29bf48a3d25ed2aca4c7a48402687e66a222580
@@ -2,3 +2,6 @@ require gcc-package-target.inc
require gcc-${PV}.inc
require gcc-package-target.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+
More information about the Openembedded-commits
mailing list