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

3 files changed, 9 insertions, 16 deletions

diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc
index 36a491af72..5bb46e1f9b 100644
--- a/packages/gcc/gcc-common.inc
+++ b/packages/gcc/gcc-common.inc
@@ -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}"
diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc
index 2976d58d05..0e03f29958 100644
--- a/packages/gcc/gcc-package-target.inc
+++ b/packages/gcc/gcc-package-target.inc
@@ -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
 
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index a6f7d3b1f8..57af41d926 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -5,10 +5,8 @@ ${GNU_MIRROR}/gcc/releases/    http://gcc.get-software.com/releases/
 ${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"