CI: Fix

Author: vkuttyp

.github/workflows/swift.yml

@@ -18,20 +18,35 @@ jobs:
       - name: Select Xcode
         run: sudo xcode-select -s /Applications/Xcode_15.4.app
 
-      - name: Install FreeTDS
-        run: brew install freetds
+      - name: Install Dependencies
+        run: brew install freetds pkg-config
+
+      - name: Setup pkg-config
+        run: |
+          # Generate freetds.pc dynamically to match runner architecture (Intel/ARM)
+          mkdir -p pkgconfig
+          FREETDS_PREFIX=$(brew --prefix freetds)
+          cat <<EOF > pkgconfig/freetds.pc
+          prefix=${FREETDS_PREFIX}
+          exec_prefix=\${prefix}
+          libdir=\${exec_prefix}/lib
+          includedir=\${prefix}/include
+
+          Name: FreeTDS
+          Description: FreeTDS library
+          Version: 1.5
+          Libs: -L\${libdir} -lsybdb -liconv
+          Cflags: -I\${includedir}
+          EOF
+          echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}/pkgconfig" >> $GITHUB_ENV
 
       - name: Build
         run: |
-          export PKG_CONFIG_PATH="$(brew --prefix freetds)/lib/pkgconfig:/opt/homebrew/lib/pkgconfig"
-          mkdir -p /opt/homebrew/lib/pkgconfig
-          cp ci/freetds.pc /opt/homebrew/lib/pkgconfig/freetds.pc
           echo "pkg-config check: $(pkg-config --cflags --libs freetds)"
           swift build -v
 
       - name: Test
         run: |
-          export PKG_CONFIG_PATH="$(brew --prefix freetds)/lib/pkgconfig:/opt/homebrew/lib/pkgconfig"
           swift test -v
         env:
           HOST:     ${{ secrets.DB_HOST }}

Sources/CFreeTDS/module.modulemap

@@ -1,7 +1,4 @@
-#ifndef CFREETDS_H
-#define CFREETDS_H
-
-#include <sybfront.h>
-#include <sybdb.h>
-
-#endif
+module CFreeTDS [system] {
+    header "include/CFreeTDS.h"
+    export *
+}

ci/freetds.pc

@@ -0,0 +1,10 @@
+prefix=/opt/homebrew/opt/freetds
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: FreeTDS
+Description: FreeTDS library
+Version: 1.5
+Libs: -L${libdir} -lsybdb -liconv
+Cflags: -I${includedir}