[oe-commits] org.oe.dev gcc: Move more common variables to gcc-common.inc (BINV, gcclibdir, use DEBIANNAME instead of a python function, SHLIBSDIR override)

[rpurdie commit]

gcc: Move more common variables to gcc-common.inc (BINV, gcclibdir, use DEBIANNAME instead of a python function, SHLIBSDIR override)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 16cec24159eea5d926a5c8a894feed50b5af349d
ViewMTN: http://monotone.openembedded.org/revision/info/16cec24159eea5d926a5c8a894feed50b5af349d
Files:
1
packages/gcc/gcc-common.inc
packages/gcc/gcc-package-target.inc
packages/gcc/gcc3-build.inc
Diffs:

#
# mt diff -r33e63802e135f168e850931644b8c4018b9a4892 -r16cec24159eea5d926a5c8a894feed50b5af349d
#
#
#
# patch "packages/gcc/gcc-common.inc"
#  from [aca6bd95d8786c9dd41d6296dfbe1447312f6e4f]
#    to [d9d032ec8b9bb0168ad0c5b150e5953cf7d06df2]
# 
# patch "packages/gcc/gcc-package-target.inc"
#  from [e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9]
#    to [94f661982c60f0579b6f08d6928b79aab4ecb8a9]
# 
# patch "packages/gcc/gcc3-build.inc"
#  from [a42be9c224a09fcc234b1b148c61acef34ccf10f]
#    to [0ebe1c6a0521a8228cff1c200ec56d27b541c437]
#
============================================================
--- packages/gcc/gcc-common.inc	aca6bd95d8786c9dd41d6296dfbe1447312f6e4f
+++ packages/gcc/gcc-common.inc	d9d032ec8b9bb0168ad0c5b150e5953cf7d06df2
@@ -12,3 +12,12 @@ def get_gcc_fpu_setting(bb, d):
         return "--with-float=soft"
     return ""
 
+# We really need HOST_SYS here for some packages and TARGET_SYS for others.
+# For now, libgcc is most important so we fix for that - RP.
+SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
+
+DEBIANNAME_libgcc = "libgcc1"
+
+# Some default values
+gcclibdir = "${libdir}/gcc"
+BINV = "${PV}"
============================================================
--- packages/gcc/gcc-package-target.inc	e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9
+++ packages/gcc/gcc-package-target.inc	94f661982c60f0579b6f08d6928b79aab4ecb8a9
@@ -1,6 +1,3 @@
-gcclibdir ?= "${libdir}/gcc"
-BINV ?= "${PV}"
-
 PACKAGES = "\
   libgcc ${PN} ${PN}-symlinks \
   g++ g++-symlinks \
@@ -14,10 +11,6 @@ PACKAGES = "\
   ${PN}-doc \
 "
 
-# We really need HOST_SYS here for some packages and TARGET_SYS for others.
-# For now, libgcc is most important so we fix for that - RP.
-SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
-
 FILES_${PN} = "\
   ${bindir}/${TARGET_PREFIX}gcc \
   ${bindir}/${TARGET_PREFIX}gccbug \
@@ -101,13 +94,6 @@ FILES_${PN}-doc = "\
   ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
 "
 
-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 () {
 	autotools_do_install
 
============================================================
--- packages/gcc/gcc3-build.inc	a42be9c224a09fcc234b1b148c61acef34ccf10f
+++ packages/gcc/gcc3-build.inc	0ebe1c6a0521a8228cff1c200ec56d27b541c437
@@ -5,10 +5,8 @@ ${GNU_MIRROR}/gcc/	http://gcc.get-softwa
 ${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
 }
 
-gcclibdir ?= "${libdir}/gcc"
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-BINV ?= "${PV}"
 
 # gcj doesn't work on some architectures
 JAVA ?= ",java"