more revert

Triple-Whale · Jun 9, 2024 · 99d7340 · 99d7340
1 parent 29615f5
commit 99d7340
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 37 deletions.
diff --git a/deps/librdkafka.gyp b/deps/librdkafka.gyp
@@ -1,8 +1,5 @@
 # pylint: disable=locally-disabled, pointless-statement, missing-module-docstring
 {
-  "variables": {
-    "CKJS_LINKING%": "<!(node ../util/get-env.js CKJS_LINKING static)",
-  },
   'targets': [
     {
       "target_name": "librdkafka",
@@ -29,49 +26,31 @@
                 "inputs": [
                   "librdkafka/config.h",
                 ],
-                "outputs": [
-                  "deps/librdkafka/src/librdkafka.so",
-                ],
                 "action": [
                   "make", "-C", "librdkafka", "libs", "install"
                 ],
                 "conditions": [
                   [
-                    'CKJS_LINKING=="dynamic"',
+                    'OS=="mac"',
                     {
-                      "conditions": [
-                        [
-                          'OS=="mac"',
-                          {
-                            'outputs': [
-                              'deps/librdkafka/src-cpp/librdkafka++.dylib',
-                              'deps/librdkafka/src-cpp/librdkafka++.1.dylib',
-                              'deps/librdkafka/src/librdkafka.dylib',
-                              'deps/librdkafka/src/librdkafka.1.dylib',
-                              'deps/librdkafka/src-cpp/librdkafka++.a',
-                              'deps/librdkafka/src/librdkafka.a',
-                            ]
-                          },
-                          {
-                            'outputs': [
-                              'deps/librdkafka/src-cpp/librdkafka++.so',
-                              'deps/librdkafka/src-cpp/librdkafka++.so.1',
-                              'deps/librdkafka/src/librdkafka.so',
-                              'deps/librdkafka/src/librdkafka.so.1',
-                              'deps/librdkafka/src-cpp/librdkafka++.a',
-                              'deps/librdkafka/src/librdkafka.a',
-                            ],
-                          },
-                        ],
-                      ]
+                      'outputs': [
+                        'deps/librdkafka/src-cpp/librdkafka++.dylib',
+                        'deps/librdkafka/src-cpp/librdkafka++.1.dylib',
+                        'deps/librdkafka/src/librdkafka.dylib',
+                        'deps/librdkafka/src/librdkafka.1.dylib'
+                      ],
                     },
                     {
                       'outputs': [
+                        'deps/librdkafka/src-cpp/librdkafka++.so',
+                        'deps/librdkafka/src-cpp/librdkafka++.so.1',
+                        'deps/librdkafka/src/librdkafka.so',
+                        'deps/librdkafka/src/librdkafka.so.1',
                         'deps/librdkafka/src-cpp/librdkafka++.a',
-                        'deps/librdkafka/src/librdkafka-static.a',
+                        'deps/librdkafka/src/librdkafka.a',
                       ],
                     }
-                  ],
+                  ]
                 ],
               }
             ]

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.1.1",
+  "version": "4.1.2",
   "description": "Node.js bindings for librdkafka",
   "librdkafka": "2.4.0",
   "main": "lib/index.js",