Unverified Commit 819a776c authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

edk2: 202505 -> 202508 (#435889)

parents e3e7ad4d 6df082c5

pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
diff --git i/BaseTools/Source/C/VfrCompile/GNUmakefile w/BaseTools/Source/C/VfrCompile/GNUmakefile

index ad6c350876..bc30e25cd3 100644

--- i/BaseTools/Source/C/VfrCompile/GNUmakefile

+++ w/BaseTools/Source/C/VfrCompile/GNUmakefile

@@ -32,6 +32,9 @@ LINKER = $(CXX)

 

 EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h

 

+CC_FOR_BUILD ?= $(CC)

+CXX_FOR_BUILD ?= $(CXX)

+

 MAKEROOT ?= ../..

 

 include $(MAKEROOT)/Makefiles/header.makefile

@@ -61,10 +64,10 @@ VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg

 	Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg

 

 Pccts/antlr/antlr:

-	$(MAKE) -C Pccts/antlr

+	$(MAKE) -C Pccts/antlr CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD)

 

 Pccts/dlg/dlg:

-	$(MAKE) -C Pccts/dlg

+	$(MAKE) -C Pccts/dlg CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD)

 

 ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp

 	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@

pkgs/by-name/ed/edk2/package.nix

+11 −12
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "edk2";

  version = "202505";

  version = "202508";



  srcWithVendoring = fetchFromGitHub {

    owner = "tianocore";

    repo = "edk2";

    tag = "edk2-stable${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8=";

    hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk=";

  };



  src = applyPatches {
@@ -53,12 +53,8 @@ stdenv.mkDerivation (finalAttrs: { 
        url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch";

        hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";

      })

      # https://github.com/tianocore/edk2/pull/5658

      (fetchpatch {

        name = "fix-cross-compilation-antlr-dlg.patch";

        url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch";

        hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU=";

      })



      ./fix-cross-compilation-antlr-dlg.patch

    ];



    # FIXME: unvendor OpenSSL again once upstream updates
@@ -86,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: { 


  makeFlags = [ "-C BaseTools" ];



  env.NIX_CFLAGS_COMPILE =

  env = {

    NIX_CFLAGS_COMPILE =

      "-Wno-return-type"

      + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"

      + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined";

    PYTHON_COMMAND = lib.getExe pythonEnv;

  };



  hardeningDisable = [

    "format"