From ec4aed7294e393c302b4b2d8e8639ecfbfc3ab21 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 24 Sep 2019 15:46:50 +0100 Subject: [PATCH] update nasm to version 2.14.02 --- ...ENDENCIES-to-0-needed-to-prevent-Per.patch | 25 +++++++++++++++++ depends/windows/nasmw/CMakeLists.txt | 16 ++++++++--- depends/windows/nasmw/nasmw.sha256 | 2 +- depends/windows/nasmw/nasmw.txt | 2 +- ...ENDENCIES-to-0-needed-to-prevent-Per.patch | 25 +++++++++++++++++ depends/windowsstore/nasmw/CMakeLists.txt | 27 +++++++++++++++++++ depends/windowsstore/nasmw/nasmw.sha256 | 1 + depends/windowsstore/nasmw/nasmw.txt | 1 + 8 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch create mode 100644 depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch create mode 100644 depends/windowsstore/nasmw/CMakeLists.txt create mode 100644 depends/windowsstore/nasmw/nasmw.sha256 create mode 100644 depends/windowsstore/nasmw/nasmw.txt diff --git a/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch b/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch new file mode 100644 index 0000000..a4627f2 --- /dev/null +++ b/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch @@ -0,0 +1,25 @@ +From: Alwin Esch +Date: Thu, 19 Sep 2019 19:29:39 +0100 +Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl + +Perl not available on build system, but test without was OK. +--- + Mkfiles/msvc.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak +index 4112c7f..22da9c6 100644 +--- a/Mkfiles/msvc.mak ++++ b/Mkfiles/msvc.mak +@@ -364,7 +364,7 @@ everything: all docs nsis + # Does this version of this file have external dependencies? This definition + # will be automatically updated by mkdep.pl as needed. + # +-EXTERNAL_DEPENDENCIES = 1 ++EXTERNAL_DEPENDENCIES = 0 + + # + # Generate dependency information for this Makefile only. +-- +2.19.2.windows.1 + diff --git a/depends/windows/nasmw/CMakeLists.txt b/depends/windows/nasmw/CMakeLists.txt index 9d6c0df..2e6a057 100644 --- a/depends/windows/nasmw/CMakeLists.txt +++ b/depends/windows/nasmw/CMakeLists.txt @@ -1,7 +1,15 @@ cmake_minimum_required(VERSION 3.5) project(nasmw) -install( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin -) +include(ExternalProject) + +externalproject_add(nasmw + SOURCE_DIR ${PROJECT_SOURCE_DIR} + BINARY_DIR ${PROJECT_SOURCE_DIR} + INSTALL_DIR ${PROJECT_SOURCE_DIR} + CONFIGURE_COMMAND "" + BUILD_COMMAND nmake /f Mkfiles/msvc.mak + INSTALL_COMMAND "") + +install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + RENAME nasmw.exe) diff --git a/depends/windows/nasmw/nasmw.sha256 b/depends/windows/nasmw/nasmw.sha256 index f1f8903..9ebd362 100644 --- a/depends/windows/nasmw/nasmw.sha256 +++ b/depends/windows/nasmw/nasmw.sha256 @@ -1 +1 @@ -91b9f784b1286e3de73dabfdc7466c198b96fef7080e00710411119959935809 +b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc diff --git a/depends/windows/nasmw/nasmw.txt b/depends/windows/nasmw/nasmw.txt index 2b643ca..d3259d3 100644 --- a/depends/windows/nasmw/nasmw.txt +++ b/depends/windows/nasmw/nasmw.txt @@ -1 +1 @@ -nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip +nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz diff --git a/depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch b/depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch new file mode 100644 index 0000000..a4627f2 --- /dev/null +++ b/depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch @@ -0,0 +1,25 @@ +From: Alwin Esch +Date: Thu, 19 Sep 2019 19:29:39 +0100 +Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl + +Perl not available on build system, but test without was OK. +--- + Mkfiles/msvc.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak +index 4112c7f..22da9c6 100644 +--- a/Mkfiles/msvc.mak ++++ b/Mkfiles/msvc.mak +@@ -364,7 +364,7 @@ everything: all docs nsis + # Does this version of this file have external dependencies? This definition + # will be automatically updated by mkdep.pl as needed. + # +-EXTERNAL_DEPENDENCIES = 1 ++EXTERNAL_DEPENDENCIES = 0 + + # + # Generate dependency information for this Makefile only. +-- +2.19.2.windows.1 + diff --git a/depends/windowsstore/nasmw/CMakeLists.txt b/depends/windowsstore/nasmw/CMakeLists.txt new file mode 100644 index 0000000..6f5d730 --- /dev/null +++ b/depends/windowsstore/nasmw/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.5) +project(nasmw) + +include(ExternalProject) + +# Prevent this on UWP ARM build +if(NOT CMAKE_GENERATOR MATCHES ARM) + externalproject_add(nasmw + SOURCE_DIR ${PROJECT_SOURCE_DIR} + BINARY_DIR ${PROJECT_SOURCE_DIR} + INSTALL_DIR ${PROJECT_SOURCE_DIR} + CONFIGURE_COMMAND "" + BUILD_COMMAND nmake /f Mkfiles/msvc.mak + INSTALL_COMMAND "") +else() + externalproject_add(nasmw + SOURCE_DIR ${PROJECT_SOURCE_DIR} + BINARY_DIR ${PROJECT_SOURCE_DIR} + INSTALL_DIR ${PROJECT_SOURCE_DIR} + CONFIGURE_COMMAND "" + BUILD_COMMAND cmake -E echo "NASM not used on UWP ARM" + INSTALL_COMMAND "") +endif() + +install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + RENAME nasmw.exe + OPTIONAL) \ No newline at end of file diff --git a/depends/windowsstore/nasmw/nasmw.sha256 b/depends/windowsstore/nasmw/nasmw.sha256 new file mode 100644 index 0000000..9ebd362 --- /dev/null +++ b/depends/windowsstore/nasmw/nasmw.sha256 @@ -0,0 +1 @@ +b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc diff --git a/depends/windowsstore/nasmw/nasmw.txt b/depends/windowsstore/nasmw/nasmw.txt new file mode 100644 index 0000000..d3259d3 --- /dev/null +++ b/depends/windowsstore/nasmw/nasmw.txt @@ -0,0 +1 @@ +nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz