fix examples and makefiles

examples/cpp/BUILD

@@ -109,7 +109,7 @@ cc_library(
     deps = [
         "//ortools/base",
         "//ortools/base:file",
-        "//ortools/base:status",
+        "@com_google_absl//absl/status",
         "//ortools/graph:ebert_graph",
         "//ortools/graph:linear_assignment",
     ],
@@ -402,7 +402,7 @@ cc_binary(
         "//ortools/base:file",
         "//ortools/base:filelineiter",
         "//ortools/base:random",
-        "//ortools/base:status",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "//ortools/base:threadpool",
         "//ortools/lp_data:mps_reader",

examples/cpp/mps_driver.cc

@@ -18,6 +18,7 @@
 
 #include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/message.h"
@@ -25,7 +26,6 @@
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/file.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/base/timer.h"
 #include "ortools/glop/lp_solver.h"
 #include "ortools/glop/parameters.pb.h"
@@ -93,7 +93,7 @@ int main(int argc, char* argv[]) {
     operations_research::MPModelProto model_proto;
     if (absl::EndsWith(file_name, ".mps") ||
         absl::EndsWith(file_name, ".mps.gz")) {
-      const util::Status parse_status =
+      const absl::Status parse_status =
           mps_reader.ParseFile(file_name, &linear_program);
       if (!parse_status.ok()) {
         LOG(INFO) << "Parse error for " << file_name << ": " << parse_status;

examples/cpp/print_dimacs_assignment.h

@@ -21,10 +21,10 @@
 #include <cstdio>
 #include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "ortools/base/file.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/graph/ebert_graph.h"
 #include "ortools/graph/linear_assignment.h"
 

examples/cpp/sat_runner.cc

@@ -21,6 +21,7 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "examples/cpp/opb_reader.h"
@@ -32,7 +33,6 @@
 #include "ortools/base/int_type.h"
 #include "ortools/base/integral_types.h"
 #include "ortools/base/logging.h"
-#include "ortools/base/status.h"
 #include "ortools/base/timer.h"
 #include "ortools/sat/boolean_problem.h"
 #include "ortools/sat/boolean_problem.pb.h"
@@ -243,9 +243,9 @@ int Run() {
   }
 
   if (FLAGS_strict_validity) {
-    const util::Status status = ValidateBooleanProblem(problem);
+    const absl::Status status = ValidateBooleanProblem(problem);
     if (!status.ok()) {
-      LOG(ERROR) << "Invalid Boolean problem: " << status.error_message();
+      LOG(ERROR) << "Invalid Boolean problem: " << status.message();
       return EXIT_FAILURE;
     }
   }

examples/cpp/solve.cc

@@ -128,7 +128,7 @@ bool Run() {
 
   // Create the solver, we use the name of the model as the solver name.
   MPSolver solver(model_proto.name(), type);
-  const util::Status set_num_threads_status =
+  const absl::Status set_num_threads_status =
       solver.SetNumThreads(FLAGS_num_threads);
   if (set_num_threads_status.ok()) {
     LOG(INFO) << "Set number of threads to " << FLAGS_num_threads << ".";

makefiles/Makefile.third_party.unix.mk

@@ -370,6 +370,7 @@ $(_ABSL_STATIC_LIB_DIR)libabsl_bad_variant_access.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_city.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_civil_time.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_examine_stack.a \
+$(_ABSL_STATIC_LIB_DIR)libabsl_cord.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_failure_signal_handler.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_flags.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_flags_config.a \
@@ -403,6 +404,7 @@ $(_ABSL_STATIC_LIB_DIR)libabsl_raw_logging_internal.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_scoped_set_env.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_spinlock_wait.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_stacktrace.a \
+$(_ABSL_STATIC_LIB_DIR)libabsl_status.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_str_format_internal.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_strings.a \
 $(_ABSL_STATIC_LIB_DIR)libabsl_strings_internal.a \

makefiles/Makefile.unix.mk

@@ -198,7 +198,7 @@ ifeq ($(PLATFORM),MACOSX)
     GLPK_LNK = $(UNIX_GLPK_DIR)/lib/libglpk.a
   endif
   ifdef UNIX_SCIP_DIR
-    SCIP_LNK = -force_load $(UNIX_SCIP_DIR)/lib/libscipopt.a $(UNIX_SCIP_DIR)/lib/libsoplex-pic.a
+    SCIP_LNK = -force_load $(UNIX_SCIP_DIR)/lib/libscipopt.a $(UNIX_SCIP_DIR)/lib/libsoplex.a
   endif
   ifdef UNIX_GUROBI_DIR
     GUROBI_LNK = \