Merge pull request #3 from renukamanavalan/fixBuildIssues

Fix build issues
sonic-net · Aug 30, 2022 · 863d69d · 863d69d
2 parents d5ba1cb + 8df4e88
commit 863d69d
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,6 +19,10 @@ resources:
     type: github
     name: sonic-net/sonic-mgmt-common
     endpoint: sonic-net
+  - repository: sonic-swss-common
+    type: github
+    name: sonic-net/sonic-swss-common
+    endpoint: sonic-net
 
 stages:
 - stage: Build
@@ -47,7 +51,12 @@ stages:
     - checkout: sonic-mgmt-common
       clean: true
       submodules: recursive
-      displayName: 'Checkout code'
+      displayName: 'Checkout sonic-mgmt-common'
+
+    - checkout: sonic-swss-common
+      clean: true
+      submodules: recursive
+      displayName: 'Checkout sonic-swss-common'
 
     - task: DownloadPipelineArtifact@2
       inputs:
@@ -81,6 +90,16 @@ stages:
         sudo dpkg -i ../target/debs/buster/libyang*1.0.73*.deb
       displayName: "Install dependency"
 
+    - script: |
+        # LIBSWSSCOMMON
+        sudo apt-get -y purge libhiredis-dev libnl-3-dev libnl-route-3-dev
+        sudo dpkg -i ../target/debs/buster/libnl-3-200_*.deb
+        sudo dpkg -i ../target/debs/buster/libnl-genl-3-200_*.deb
+        sudo dpkg -i ../target/debs/buster/libnl-route-3-200_*.deb
+        sudo dpkg -i ../target/debs/buster/libnl-nf-3-200_*.deb
+        sudo dpkg -i ../target/debs/buster/libhiredis0.14_*.deb
+      displayName: "Install libswsscommon dependencies"
+
     - script: |
         set -ex
         # Install .NET CORE
@@ -90,6 +109,25 @@ stages:
         sudo apt-get install -y dotnet-sdk-5.0
       displayName: "Install .NET CORE"
 
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: build
+        pipeline: Azure.sonic-swss-common
+        artifact: sonic-swss-common
+        runVersion: 'latestFromBranch'
+        runBranch: 'refs/heads/master'
+      displayName: "Download sonic-swss-common"
+
+    - script: |
+        set -ex
+        # LIBSWSSCOMMON
+        sudo dpkg -i libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb
+        sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
+      workingDirectory: $(Pipeline.Workspace)/
+      displayName: 'Install libswsscommon package'
+
     - script: |
         set -ex
         ls -l

diff --git a/sonic_data_client/events_client.go b/sonic_data_client/events_client.go
@@ -1,8 +1,8 @@
 package client
 
 /*
-#cgo CFLAGS: -g -Wall -I/sonic/src/sonic-swss-common/common -Wformat -Werror=format-security -fPIE 
-#cgo LDFLAGS: -lpthread -lboost_thread -lboost_system -lzmq -lboost_serialization -luuid -lswsscommon
+#cgo CFLAGS: -g -Wall -I../../sonic-swss-common/common -Wformat -Werror=format-security -fPIE 
+#cgo LDFLAGS: -L/usr/lib -lpthread -lboost_thread -lboost_system -lzmq -lboost_serialization -luuid -lswsscommon
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -239,8 +239,7 @@ func get_events(evtc *EventClient) {
     str_ptr := C.malloc(C.sizeof_char * C.size_t(EVENT_BUFFSZ)) 
     defer C.free(unsafe.Pointer(str_ptr))
 
-    evt_ptr := &C.event_receive_op_C_t{}
-    evt_ptr = (*C.event_receive_op_C_t)(C.malloc(C.size_t(unsafe.Sizeof(C.event_receive_op_C_t{}))))
+    evt_ptr := (*C.event_receive_op_C_t)(C.malloc(C.size_t(unsafe.Sizeof(C.event_receive_op_C_t{}))))
     defer C.free(unsafe.Pointer(evt_ptr))
 
     evt_ptr.event_str = (*C.char)(str_ptr)