Unverified Commit 479aa3cd authored by Audrey Dutcher's avatar Audrey Dutcher Committed by GitHub
Browse files

meson: Configure with -Db_lundef=false for FreeBSD (#387502)

parents fa22578d e27c288c

pkgs/by-name/gl/glib/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: { 
      "-Dlibelf=disabled"

    ]

    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [

      "-Db_lundef=false"

      "-Dxattr=false"

      "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD

    ];

pkgs/by-name/me/meson/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ python3.pkgs.buildPythonApplication rec { 
  '';



  setupHook = ./setup-hook.sh;

  env.hostPlatform = stdenv.targetPlatform.system;



  meta = {

    homepage = "https://mesonbuild.com";

pkgs/by-name/me/meson/setup-hook.sh

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ mesonConfigurePhase() { 
        "--buildtype=${mesonBuildType:-plain}"

    )



    # --no-undefined is universally a bad idea on freebsd because environ is in the csu

    if [[ "@hostPlatform@" == *-freebsd ]]; then

        flagsArray+=("-Db_lundef=false")

    fi



    concatTo flagsArray mesonFlags mesonFlagsArray



    echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}"