From 04ade489acc21f35e1392dd9ce837cf924ed7c53 Mon Sep 17 00:00:00 2001 From: Geans Pin Date: Wed, 4 Mar 2026 06:32:22 -0800 Subject: [PATCH 1/2] PDE migration for trixie Signed-off-by: Geans Pin --- sonic-pde-tests/sonic_pde_saiut/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sonic-pde-tests/sonic_pde_saiut/Makefile b/sonic-pde-tests/sonic_pde_saiut/Makefile index 054318b..dcaacbf 100644 --- a/sonic-pde-tests/sonic_pde_saiut/Makefile +++ b/sonic-pde-tests/sonic_pde_saiut/Makefile @@ -1,8 +1,12 @@ SAI_INC := /usr/include/sai SAI_LIB := /usr/lib + +PYTHON_VERSION := $(shell python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +PYTHON_INC := /usr/include/python$(PYTHON_VERSION) + CC := gcc -CFLAGS := -fPIC -I/usr/include/python3.11 -I$(SAI_INC) -I$(SAI_INC)/experimental +CFLAGS := -fPIC -I$(PYTHON_INC) -I$(SAI_INC) -I$(SAI_INC)/experimental LDFLAGS := -L$(SAI_LIB) -lsai @@ -11,17 +15,22 @@ all: _saiut.so setup: rm -rf .inc mkdir -p .inc - ln -s $(SAI_INC)/saitypes.h .inc/ - ln -s $(SAI_INC)/saistatus.h .inc/ - ln -s $(SAI_INC)/saiport.h .inc/ + ln -sf $(SAI_INC)/saitypes.h .inc/ + ln -sf $(SAI_INC)/saistatus.h .inc/ + ln -sf $(SAI_INC)/saiport.h .inc/ saiut_wrap.c: setup saiut.i swig -python saiut.i saiut_wrap.o: saiut_wrap.c + $(CC) $(CFLAGS) -c $< -o $@ + +saiut.o: saiut.c + $(CC) $(CFLAGS) -c $< -o $@ _saiut.so: saiut.o saiut_wrap.o - gcc -shared $^ $(LDFLAGS) -o $@ + $(CC) -shared $^ $(LDFLAGS) -o $@ clean: rm -rf *.so *.o *_wrap.c saiut.py saiut.pyc .inc/ + From 687498a450b7421956ba5049c1197a8503488d9d Mon Sep 17 00:00:00 2001 From: Geans Pin Date: Wed, 4 Mar 2026 06:32:22 -0800 Subject: [PATCH 2/2] PDE migration for trixie Signed-off-by: Geans Pin --- sonic-pde-tests/sonic_pde_saiut/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sonic-pde-tests/sonic_pde_saiut/Makefile b/sonic-pde-tests/sonic_pde_saiut/Makefile index dcaacbf..3b533e9 100644 --- a/sonic-pde-tests/sonic_pde_saiut/Makefile +++ b/sonic-pde-tests/sonic_pde_saiut/Makefile @@ -2,11 +2,9 @@ SAI_INC := /usr/include/sai SAI_LIB := /usr/lib -PYTHON_VERSION := $(shell python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -PYTHON_INC := /usr/include/python$(PYTHON_VERSION) - +PYTHON_CFLAGS := $(shell python3-config --includes) CC := gcc -CFLAGS := -fPIC -I$(PYTHON_INC) -I$(SAI_INC) -I$(SAI_INC)/experimental +CFLAGS := -fPIC $(PYTHON_CFLAGS) -I$(SAI_INC) -I$(SAI_INC)/experimental LDFLAGS := -L$(SAI_LIB) -lsai