Unverified Commit c1c046cd authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

openroad: 2.0-unstable-2024-12-31 -> 2.0-unstable-2025-03-01 (#386307)

parents b74111e2 020de628

pkgs/applications/science/electronics/openroad/default.nix

+8 −11
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  git,

  python3,

  swig,

  boost,

  boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442

  cbc, # for clp

  cimg,

  clp, # for or-tools
@@ -44,20 +44,16 @@ let 
in

mkDerivation rec {

  pname = "openroad";

  version = "2.0-unstable-2024-12-31";

  version = "2.0-unstable-2025-03-01";



  src = fetchFromGitHub {

    owner = "The-OpenROAD-Project";

    repo = "OpenROAD";

    rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9";

    rev = "e794373d44ac5421f0633d8dda7e5c59e8fe79bf";

    fetchSubmodules = true;

    hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o=";

    hash = "sha256-a/X4FHkbiqHeblse2ZkLT56gYP+LCrAIZVCdsWF59jM=";

  };



  patches = [

    ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451

  ];



  nativeBuildInputs = [

    bison

    cmake
@@ -70,7 +66,7 @@ mkDerivation rec { 
  ];



  buildInputs = [

    boost

    boost186

    cbc

    cimg

    clp
@@ -99,12 +95,15 @@ mkDerivation rec { 


  postPatch = ''

    patchShebangs --build etc/find_messages.py

    # Disable two tests that are failing curently.

    sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt

  '';



  cmakeFlags = [

    "-DENABLE_TESTS=ON"

    "-DUSE_SYSTEM_BOOST=ON"

    "-DUSE_SYSTEM_ABC=OFF"

    "-DABC_SKIP_TESTS=ON" # it attempts to download gtest

    "-DUSE_SYSTEM_OPENSTA=OFF"

    "-DOPENROAD_VERSION=${version}_${src.rev}"

    "-DCMAKE_RULE_MESSAGES=OFF"
@@ -119,8 +118,6 @@ mkDerivation rec { 
  # to see if there are any breaking changes in unstable that should be vendored as well.

  doCheck = true;

  checkPhase = ''

    # Disable two tests that are failing curently.

    sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake

    make test

    ../test/regression

  '';

pkgs/applications/science/electronics/openroad/swig43-compat.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
--- a/src/odb/src/swig/python/dbtypes.i

+++ b/src/odb/src/swig/python/dbtypes.i

@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)

   swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*");

   for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {

     PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);

-    $result = SWIG_Python_AppendOutput($result, o);

+    $result = SWIG_AppendOutput($result, o);

   }

 }

 

@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)

     auto layer = it->second;

     PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);

     PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);

-    $result = SWIG_Python_AppendOutput($result, tuple);

+    $result = SWIG_AppendOutput($result, tuple);

   }

 }

 

 %typemap(argout) std::vector<int> &OUTPUT {

   for(auto it = $1->begin(); it != $1->end(); it++) {

     PyObject *obj = PyInt_FromLong((long)*it);

-    $result = SWIG_Python_AppendOutput($result, obj);

+    $result = SWIG_AppendOutput($result, obj);

   }

 }