Fix vita-makepkg dropping the world's CARCH in bin/makepkg.conf

Regressed by an earlier git checkout -- in this same session that reverted
this file to HEAD and got only partially undone: vita-makepkg went back to
a plain copy of makepkg.conf.sample, which always says CARCH="vita",
instead of running it through WriteMakepkgConf.cmake. Caught by CI, not
locally: validate-core-package.sh's own world-coherence check failed a
real vita-softfp build with "version_info.txt says vita-softfp,
bin/makepkg.conf CARCH says vita" on every host.

Author: frangarcj

cmake/recipes/BuildHostTools.cmake

@@ -79,6 +79,10 @@ ExternalProject_Add(vita-makepkg
     INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/bin/
     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/libmakepkg ${CMAKE_INSTALL_PREFIX}/bin/libmakepkg
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/vita-makepkg ${CMAKE_INSTALL_PREFIX}/bin/
-    COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/makepkg.conf.sample ${CMAKE_INSTALL_PREFIX}/bin/makepkg.conf
+    COMMAND ${CMAKE_COMMAND}
+        -DINPUT=<SOURCE_DIR>/makepkg.conf.sample
+        -DOUTPUT=${CMAKE_INSTALL_PREFIX}/bin/makepkg.conf
+        -DWORLD_ARCH=${world_arch}
+        -P ${PROJECT_SOURCE_DIR}/cmake/WriteMakepkgConf.cmake
     ${UPDATE_DISCONNECTED_SUPPORT}
     )

cmake/recipes/BuildSdkComponents.cmake

@@ -106,4 +106,3 @@ ExternalProject_Add(samples
     COMMAND ${GIT_EXECUTABLE} -C <SOURCE_DIR> rev-parse HEAD > ${CMAKE_BINARY_DIR}/samples-version.txt
     ${UPDATE_DISCONNECTED_SUPPORT}
     )
-