Strip prefix for glpk to align with BCR

google · Oct 30, 2024 · 6340ae8 · 6340ae8
1 parent 7c4b309
commit 6340ae8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -169,6 +169,7 @@ http_archive(
     build_file = "//bazel:glpk.BUILD.bazel",
     sha256 = "4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15",
     url = "http://ftp.gnu.org/gnu/glpk/glpk-5.0.tar.gz",
+    strip_prefix = "glpk-5.0",
 )
 
 http_archive(

diff --git a/bazel/glpk.BUILD.bazel b/bazel/glpk.BUILD.bazel
@@ -15,37 +15,37 @@ cc_library(
     name = "glpk",
     srcs = glob(
         [
-            "glpk-5.0/src/*.c",
-            "glpk-5.0/src/*/*.c",
-            "glpk-5.0/src/*.h",
-            "glpk-5.0/src/*/*.h",
+            "src/*.c",
+            "src/*/*.c",
+            "src/*.h",
+            "src/*/*.h",
         ],
         exclude = [
-            "glpk-5.0/src/proxy/main.c",
-            "glpk-5.0/src/zlib/*",
+            "src/proxy/main.c",
+            "src/zlib/*",
         ],
     ),
     hdrs = [
-        "glpk-5.0/src/glpk.h",
+        "src/glpk.h",
     ],
     copts = [
         "-w",
-        "-Iexternal/glpk/glpk-5.0/src",
-        "-Iexternal/glpk/glpk-5.0/src/amd",
-        "-Iexternal/glpk/glpk-5.0/src/api",
-        "-Iexternal/glpk/glpk-5.0/src/bflib",
-        "-Iexternal/glpk/glpk-5.0/src/colamd",
-        "-Iexternal/glpk/glpk-5.0/src/draft",
-        "-Iexternal/glpk/glpk-5.0/src/env",
-        "-Iexternal/glpk/glpk-5.0/src/intopt",
-        "-Iexternal/glpk/glpk-5.0/src/minisat",
-        "-Iexternal/glpk/glpk-5.0/src/misc",
-        "-Iexternal/glpk/glpk-5.0/src/mpl",
-        "-Iexternal/glpk/glpk-5.0/src/npp",
-        "-Iexternal/glpk/glpk-5.0/src/proxy",
-        "-Iexternal/glpk/glpk-5.0/src/simplex",
+        "-Iexternal/glpk/src",
+        "-Iexternal/glpk/src/amd",
+        "-Iexternal/glpk/src/api",
+        "-Iexternal/glpk/src/bflib",
+        "-Iexternal/glpk/src/colamd",
+        "-Iexternal/glpk/src/draft",
+        "-Iexternal/glpk/src/env",
+        "-Iexternal/glpk/src/intopt",
+        "-Iexternal/glpk/src/minisat",
+        "-Iexternal/glpk/src/misc",
+        "-Iexternal/glpk/src/mpl",
+        "-Iexternal/glpk/src/npp",
+        "-Iexternal/glpk/src/proxy",
+        "-Iexternal/glpk/src/simplex",
     ],
     deps = ["@zlib"],
-    includes = ["glpk-5.0/src"],
+    includes = ["src"],
     visibility = ["//visibility:public"],
 )