revert

Triple-Whale · Jun 9, 2024 · f3aeb8f · f3aeb8f
1 parent 3d03041
commit f3aeb8f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 30 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -4,7 +4,6 @@
     # may be redefined in command line on configuration stage
     # "BUILD_LIBRDKAFKA%": "<!(echo ${BUILD_LIBRDKAFKA:-1})"
     "BUILD_LIBRDKAFKA%": "<!(node ./util/get-env.js BUILD_LIBRDKAFKA 1)",
-    "CKJS_LINKING%": "<!(node ./util/get-env.js CKJS_LINKING static)",
   },
   "targets": [
     {
@@ -87,36 +86,24 @@
                   ],
                   'conditions': [
                     [
-                      'CKJS_LINKING=="dynamic"',
-                      {
-                        "conditions": [
-                            [
-                                'OS=="mac"',
-                                {
-                                  "libraries": [
-                                    "../build/deps/librdkafka.dylib",
-                                    "../build/deps/librdkafka++.dylib",
-                                    "-Wl,-rpath,'$$ORIGIN/../deps'",
-                                  ],
-                                },
-                                {
-                                    "libraries": [
-                                      "../build/deps/librdkafka.so",
-                                      "../build/deps/librdkafka++.so",
-                                      "-Wl,-rpath,'$$ORIGIN/../deps'",
-                                    ],
-                                },
-                            ]
-                        ]
-                      },
+                      'OS=="linux"',
                       {
                         "libraries": [
-                          "../build/deps/librdkafka-static.a",
-                          "../build/deps/librdkafka++.a",
-                          "-Wl,-rpath,'$$ORIGIN/../deps'",
+                          "../build/deps/librdkafka",
+                          "../build/deps/librdkafka++",
+                          "-Wl,-rpath='$$ORIGIN/../deps'",
                         ],
                       }
                     ],
+                    [
+                      'OS=="mac"',
+                      {
+                        "libraries": [
+                          "../build/deps/librdkafka.dylib",
+                          "../build/deps/librdkafka++.dylib",
+                        ],
+                      }
+                    ]
                   ],
                 },
                 # Else link against globally installed rdkafka and use
@@ -165,4 +152,4 @@
       ]
     }
   ]
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@triplewhale/node-rdkafka",
-  "version": "4.0.38",
+  "version": "4.1.0",
   "description": "Node.js bindings for librdkafka",
   "librdkafka": "2.4.0",
   "main": "lib/index.js",