build_shim.sh: fix bugs regarding the build

Signed-off-by: Alireza Sanaee <[email protected]>
microsoft · Sep 28, 2024 · 2a8a4f0 · 2a8a4f0
1 parent 6c673a0
commit 2a8a4f0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/build_shim.sh b/build_shim.sh
@@ -18,6 +18,9 @@ fi
 BASE_DIR="$(dirname "$(readlink -f "$0")")"
 SRC_DIR="${BASE_DIR}/src/ext"
 
+blue "Downloding dependency ..."
+sudo apt install libgflags-dev
+
 blue "Building Machnet shim library..."
 
 cd "${SRC_DIR}" || exit 1

diff --git a/examples/Makefile b/examples/Makefile
@@ -1,5 +1,5 @@
 CC = g++
-CFLAGS = -I../src/ext -L../ -lmachnet_shim -lrt -lgflags -Wl,-rpath,..
+CFLAGS = -I../src/include -I../src/ext -L../ -lmachnet_shim -lrt -lgflags -Wl,-rpath,..
 
 all: hello_world
 

diff --git a/examples/hello_world.cc b/examples/hello_world.cc
@@ -26,7 +26,7 @@ void assert_with_msg(bool cond, const char *msg) {
 }
 
 int main(int argc, char *argv[]) {
-  google::ParseCommandLineFlags(&argc, &argv, true);
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   int ret = machnet_init();
   assert_with_msg(ret == 0, "machnet_init() failed");

diff --git a/src/ext/Makefile b/src/ext/Makefile
@@ -4,6 +4,7 @@ LDFLAGS = -shared
 LIBS = -luuid
 TARGET = libmachnet_shim.so
 SRCS = machnet.c
+INC = ../include
 OBJS = $(SRCS:.c=.o)
 
 all: $(TARGET)
@@ -12,7 +13,7 @@ $(TARGET): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) -I$(INC) $(CFLAGS) -c $< -o $@
 
 clean:
 	rm -f $(OBJS) $(TARGET)

diff --git a/src/ext/jring_elem_private.h b/src/ext/jring_elem_private.h
@@ -15,9 +15,10 @@ extern "C" {
 #endif
 
 #include <memory.h>
-#include <pause.h>
 #include <stdint.h>
 
+#include "pause.h"
+
 #ifndef likely
 #define likely(x) __builtin_expect((x), 1)
 #endif