Remove architecture specific dependencies for L1 builds - #420
Open
shibu-kv wants to merge 6 commits into
Open
Conversation
shibu-kv
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to enable multi-architecture builds by removing hard-coded GLib include paths and introducing architecture-aware library/include path handling in build scripts.
Changes:
- Add architecture detection logic to adjust library/include paths in shell build scripts.
- Replace a hard-coded GLib include path in
mock-parodus/Makefile.amwithpkg-config-derived flags. - Update
cov_build.shto extendLD_LIBRARY_PATHand to use arch-specific GLib include/lib directories.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
src/hostif/parodusClient/pal/mock-parodus/mock_parodus_build.sh |
Adds arch detection and attempts to patch GLib include paths before building mock parodus. |
src/hostif/parodusClient/pal/mock-parodus/Makefile.am |
Switches GLib include flags from a hard-coded multiarch path to pkg-config --cflags glib-2.0. |
cov_build.sh |
Adds arch detection, updates LD_LIBRARY_PATH, and replaces hard-coded x86_64 GLib paths with arch-dependent ones. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
| ./configure --enable-IPv6=yes | ||
|
|
||
|
|
||
| make AM_CXXFLAGS="-I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/include -I/usr/include/cjson -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/handlers/include -I$WORKDIR/src/hostif/parodusClient/waldb -I$WORKDIR/src/hostif/profiles/DeviceInfo -I/usr/include/cjson -I$WORKDIR/src/hostif/profiles/Time -I$WORKDIR/src/hostif/profiles/Device -I/usr/include/libsoup-3.0 -I/usr/include/yajl -I$WORKDIR/src/hostif/profiles/STBService -I$WORKDIR/src/unittest/stubs/ds -I/usr/devicesettings/ds -I/usr/local/include -I$WORKDIR/src/hostif/profiles/IP -I$WORKDIR/src/hostif/profiles/Ethernet -I/usr/local/include/rbus -I$WORKDIR/src/hostif/parodusClient/pal -I/usr/rdk-halif-device_settings/include -I/usr/local/include/libparodus -I/usr/local/include -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/local/include/ -I/usr/include/yajl -I/usr/tinyxml2 -I/usr/devicesettings/ds -I/$WORKDIR/src/hostif/httpserver/include -I/usr/remote_debugger/src/ -DIPV6_SUPPORT" \ |
Comment on lines
+18
to
+20
| echo "Warning: Unsupported architecture $ARCH, defaulting to x86_64 paths" | ||
| ARCH_LIB_PATH="/usr/lib/x86_64-linux-gnu" | ||
| ARCH_LIB_PATH_ALT="/lib/x86_64-linux-gnu" |
| ../../../handlers/src/hostIf_rbus_Dml_Provider.cpp | ||
|
|
||
| parodus_CPPFLAGS = -I../ -I../../../../unittest/stubs/ -I/usr/local/include/wrp-c/ -I../../waldb/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/local/include/wdmp-c/ -I/usr/local/include/rbus -I../../../include/ -I../../../../unittest/stubs/ -I../../../handlers/src/ -I/usr/local/include/cjson/ -I/usr/local/include/libparodus/ -I./ -I../../waldb/ -I../../../handlers/include/ -I../../../profiles/Time/ -I../../../profiles/DeviceInfo/ -I../../../profiles/Device -I../../../handlers/include/ -I../../../../unittest/stubs/ds -I../../../profiles/Ethernet/ -I../../../include/ -I../../../profiles/IP/ -I../../../profiles/STBService/ -I/usr/rdk-halif-device_settings/include/ -I/usr/rdkvhal-devicesettings-raspberrypi4/ -DUSE_REMOTE_DEBUGGER -I/usr/remote_debugger/src/ | ||
| MOCK_PARODUS_GLIB_CFLAGS = $(if $(strip $(GLIB_CFLAGS)),$(GLIB_CFLAGS),$(shell pkg-config --cflags glib-2.0 2>/dev/null)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.