File tree Expand file tree Collapse file tree
libs/openFrameworksCompiled/project/makefileCommon Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -148,7 +148,7 @@ ifndef PLATFORM_LIB_SUBPATH
148148$(error This makefile does not support Raspberry Pi architecture $(PLATFORM_ARCH))
149149 endif
150150 else ifeq ($(JETSON_DETECTED),yes)
151- PLATFORM_LIB_SUBPATH=linux/jetson
151+ PLATFORM_LIB_SUBPATH=linux/arm64
152152 PLATFORM_CONFIG_SUBPATH=linux/arm64
153153 PLATFORM_CONFIG_ID=linuxarm64
154154 else
Original file line number Diff line number Diff line change @@ -219,6 +219,19 @@ else
219219 bad " config.shared.mk does not allow JETSON_DETECTED override"
220220fi
221221
222+ echo
223+ echo " == Jetson uses the Ubuntu arm64 (linux/arm64) libs =="
224+ if grep -q ' Jetson.*Ubuntu arm64 libs' " $DL " ; then
225+ ok " download_libs.sh maps Jetson to the Ubuntu arm64 libs"
226+ else
227+ bad " download_libs.sh does not map Jetson to the Ubuntu arm64 libs"
228+ fi
229+ if grep -A2 ' JETSON_DETECTED),yes' " $SHARED " | grep -q ' PLATFORM_LIB_SUBPATH=linux/arm64' ; then
230+ ok " makefile Jetson path uses linux/arm64 libs"
231+ else
232+ bad " makefile Jetson path does not use linux/arm64 libs"
233+ fi
234+
222235echo
223236echo " Passed: ${PASS} Failed: ${FAIL} "
224237if [[ " $FAIL " -ne 0 ]]; then
Original file line number Diff line number Diff line change @@ -136,6 +136,23 @@ is_raspberry_pi(){
136136 return 1
137137}
138138
139+ is_jetson (){
140+ local root=" ${OF_RPI_PROBE_ROOT:- } "
141+ local model=" "
142+ if [ -f " $root /proc/device-tree/model" ]; then
143+ model=" $( tr -d ' \0' < " $root /proc/device-tree/model" 2> /dev/null || true) "
144+ elif [ -f " $root /sys/firmware/devicetree/base/model" ]; then
145+ model=" $( tr -d ' \0' < " $root /sys/firmware/devicetree/base/model" 2> /dev/null || true) "
146+ fi
147+ if echo " $model " | grep -qiE ' jetson|tegra' ; then
148+ return 0
149+ fi
150+ if [ -f " $root /etc/nv_tegra_release" ]; then
151+ return 0
152+ fi
153+ return 1
154+ }
155+
139156# Canonical apothecary / linux2026 makefile paths: lib/linux/<arch>
140157linux_canonical_lib_subpath (){
141158 case " $1 " in
@@ -532,6 +549,23 @@ if [ "$PLATFORM" == "vs" ]; then
532549 esac
533550fi
534551
552+ # Jetson (L4T) is Ubuntu arm64 and apothecary publishes no linux_jetson
553+ # archive, so Jetson always uses the Ubuntu arm64 libs.
554+ if [ " $PLATFORM " == " linux" ]; then
555+ case " $ARCH " in
556+ jetson|armv8l)
557+ ARCH=arm64
558+ echo " Jetson → using Ubuntu arm64 libs (linux/arm64)"
559+ ;;
560+ aarch64)
561+ if is_jetson; then
562+ ARCH=arm64
563+ echo " Jetson detected → using Ubuntu arm64 libs (linux/arm64)"
564+ fi
565+ ;;
566+ esac
567+ fi
568+
535569# An explicit -a arm64 on Raspberry Pi hardware / RPi OS would download the
536570# generic linux/arm64 artifact while the makefiles build linux/aarch64 there.
537571# Normalise to the RPi artifact whenever a Pi is detected.
@@ -561,9 +595,6 @@ if [ "$PLATFORM" == "linux" ]; then
561595 64|x86_64|arm64|aarch64|armv6l|armv7l)
562596 OPT=" _${GCC_VERSION} "
563597 ;;
564- jetson|armv8l)
565- OPT=" "
566- ;;
567598 * )
568599 OPT=" _${GCC_VERSION} "
569600 ;;
You can’t perform that action at this time.
0 commit comments