From 493527ef5e33958970163a69f0d166654dde05cd Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 16 Aug 2024 15:25:11 +0800
Subject: LL's prebuilt files are saved in build directory

in their original names.
---
 indra/cmake/Prebuilt.cmake | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 9125864c1d..793da3338f 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -61,18 +61,16 @@ macro (use_prebuilt_binary _binary)
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     )
             endif ("${package_url}" STREQUAL "")
-            execute_process(COMMAND curl
-                -L
+            string(REGEX REPLACE ^https://github.com/secondlife/3p-${_binary}/releases/download/v[0-9]+.*/ "" package_name ${package_url})
+            file(DOWNLOAD
                 ${package_url}
-                -o ${_binary}.tar.zst
-                WORKING_DIRECTORY /tmp
+                ${CMAKE_BINARY_DIR}/${package_name}
                 )
-            execute_process(COMMAND tar
-                xf
-                /tmp/${_binary}.tar.zst
-                WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
-                RESULT_VARIABLE ${_binary}_installed
+            file(ARCHIVE_EXTRACT
+                INPUT ${CMAKE_BINARY_DIR}/${package_name}
+                DESTINATION ${AUTOBUILD_INSTALL_DIR}
                 )
+            set(${_binary}_installed 0)
         else(USESYSTEMLIBS)
         execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
                 install
-- 
cgit v1.2.3


From 90127cf36c5ca6e7c6273261830e65da2d7e9c73 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 16 Aug 2024 15:27:00 +0800
Subject: Fix meshoptimizer & NDOF tracking contains garbage

instead of 0.
---
 indra/cmake/Meshoptimizer.cmake | 2 +-
 indra/cmake/NDOF.cmake          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index a47c59c96b..018fea57a0 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -60,7 +60,7 @@ if (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR NOT USESYSTEMLIBS)
           COPY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21/libmeshoptimizer.a
           DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
           )
-        file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
+        file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "0")
       endif (${MESHOPTIMIZER_RESULT})
     endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0)
   else (USESYSTEMLIBS)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 456507e1bd..1bf6c5086c 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -39,7 +39,7 @@ if (NDOF)
           COPY ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7/libndofdev/src/libndofdev.dylib
           DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
           )
-        file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+        file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "0")
       endif (${LIBNDOFDEV_RESULT})
     endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0)
   else (USESYSTEMLIBS)
-- 
cgit v1.2.3