[FIXED] Build: issue on Android with NATS_EXTRA_LIB (#739)

* [FIXED] Build: issue on Android with NATS_EXTRA_LIB A user (@psantiagol) reported an issue (in #64) building on Android due to the use of `NATS_EXTRA_LIB`. This PR skip the definition of this variable if building on Android. Should other users then report that this is breaking their build on Android, we will have to make this a conditional based on a boolean build option. Signed-off-by: Ivan Kozlovic <[email protected]> * Fix test JetStreamBackOffRedeliveries With PR nats-io/nats-server#5242 in server code, not providing a MaxDeliver is considered unlimited and should not error out. So fixing test to set MaxDeliver <= to the backoff list to get the expected error. Signed-off-by: Ivan Kozlovic <[email protected]> --------- Signed-off-by: Ivan Kozlovic <[email protected]>
nats-io · Apr 12, 2024 · f11e3e5 · f11e3e5
1 parent 2ab48fd
commit f11e3e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -177,7 +177,9 @@ if(UNIX)
   else(APPLE)
     set(NATS_OS "LINUX")
     set(NATS_USE_PTHREAD "-pthread")
-    set(NATS_EXTRA_LIB "rt -lpthread")
+    if(NOT ANDROID)
+      set(NATS_EXTRA_LIB "rt -lpthread")
+    endif()
   endif(APPLE)
   if (${NATS_BUILD_ARCH} MATCHES "32")
     if(NOT APPLE)

diff --git a/test/test.c b/test/test.c
@@ -30205,6 +30205,7 @@ test_JetStreamBackOffRedeliveries(void)
     so.Config.AckPolicy = js_AckExplicit;
     so.Config.DeliverPolicy = js_DeliverAll;
     so.Config.DeliverSubject = inbox;
+    so.Config.MaxDeliver = 2;
     so.Config.BackOff = (int64_t[]){NATS_MILLIS_TO_NANOS(50), NATS_MILLIS_TO_NANOS(250)};
     so.Config.BackOffLen = 2;
     s = js_SubscribeSync(&sub, js, "foo", NULL, &so, &jerr);