Skip to contentSkip to conversation

musl: Move away from gcc-initial dependency

PATCH In review Khem Raj 2 participants 6 messages Dec 19, 2018 – Dec 20, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 musl: Move away from gcc-initial dependency

gcc-initial step is no more needed

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/musl/musl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/musl/musl_git.bb +1 -1
index 9cc875c4a6..6f6129d7c5 100644
@@ -20,7 +20,7 @@ S = "${WORKDIR}/git"
 PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc virtual/libiconv virtual/libintl virtual/crypt"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
-           virtual/${TARGET_PREFIX}gcc-initial \
+           virtual/${TARGET_PREFIX}gcc \
            libgcc-initial \
            linux-libc-headers \
            bsd-headers \
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 2/5 newlib: Move away from gcc-initial dependency

gcc-initial step is no more needed

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/newlib/newlib.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/newlib/newlib.inc +1 -1
index c97c7c276b..c68c163266 100644
@@ -20,7 +20,7 @@ SRC_URI[md5sum] = "81ec873108b8593c586f91ca65963952"
 SRC_URI[sha256sum] = "c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332"
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc"
 
 PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
 STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
Signature · 1 line
2.20.1
Acked-by on v1 2/5
#2 lore raw

Re: [PATCH 2/5] newlib: Move away from gcc-initial dependency

Quoted 12 lines · Khem Raj

gcc-initial step is no more needed

Signed-off-by Khem Raj <[email protected]>
---
  meta/recipes-core/newlib/newlib.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/newlib/newlib.inc +0 -0
index c97c7c276b..c68c163266 100644

meta/recipes-core/newlib/newlib.inc SRC_URI[md5sum] = "81ec873108b8593c586f91ca65963952" · line 26

Quoted 8 lines
meta/recipes-core/newlib/newlib.inc +1 -1
@@ -20,7 +20,7 @@ SRC_URI[md5sum] = "81ec873108b8593c586f91ca65963952"
  SRC_URI[sha256sum] = "c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332"
 
  INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc"
 
  PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
  STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"

Thanks Khem.

Acked-by Alejandro Hernandez <[email protected]>
author
#3 lore raw

PATCH 3/5 libssp: Remove dependency on gcc-initial

In reply to Khem Raj

Its not needed anymore and it can depend on gcc-cross instead

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/musl/libssp-nonshared.bb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
meta/recipes-core/musl/libssp-nonshared.bb +1 -6
index 458eafef52..bae8c81cc7 100644
@@ -8,15 +8,10 @@ SECTION = "libs"
 
 SRC_URI = "file://ssp-local.c"
 
-PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
-
 INHIBIT_DEFAULT_DEPS = "1"
 
-STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
-STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
-           virtual/${TARGET_PREFIX}gcc-initial \
+           virtual/${TARGET_PREFIX}gcc \
 "
 
 do_configure[noexec] = "1"
Signature · 1 line
2.20.1
author
#4 lore raw

PATCH 4/5 tcmode-default: Drop pinnings for gcc-initial based recipes

In reply to Khem Raj
Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/distro/include/tcmode-default.inc | 2 --
 1 file changed, 2 deletions(-)
meta/conf/distro/include/tcmode-default.inc +0 -2
index 48224ca6b9..fe24bd9b32 100644
@@ -3,14 +3,12 @@
 #
 
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross-${TARGET_ARCH}"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial-${TARGET_ARCH}"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_ARCH}"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
 PREFERRED_PROVIDER_gdb = "gdb"
 
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
Signature · 1 line
2.20.1
author
#5 lore raw

PATCH 5/5 base.bbclass, classextend.py: Drop catering to gcc-initial

In reply to Khem Raj
Signed-off-by Khem Raj <[email protected]>
---
 meta/classes/base.bbclass  | 1 -
 meta/lib/oe/classextend.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/classes/base.bbclass +0 -1
index e6af673847..f1a3c0e53e 100644
@@ -264,7 +264,6 @@ python base_eventhandler() {
     if isinstance(e, bb.event.RecipePreFinalise):
         if d.getVar("TARGET_PREFIX") == d.getVar("SDK_PREFIX"):
             d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils")
-            d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial")
             d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc")
             d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++")
             d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs")
meta/lib/oe/classextend.py +1 -1
index d2eeaf0e5c..662707b859 100644
@@ -114,7 +114,7 @@ class NativesdkClassExtender(ClassExtender):
     def map_depends(self, dep):
         if dep.startswith(self.extname):
             return dep
-        if dep.endswith(("-gcc-initial", "-gcc", "-g++")):
+        if dep.endswith(("-gcc", "-g++")):
             return dep + "-crosssdk"
         elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep):
             return dep
Signature · 1 line
2.20.1