mirror of
https://github.com/feather-wallet/feather.git
synced 2025-01-03 09:29:37 +00:00
depends: native_libtapi: don't include git rev
This commit is contained in:
parent
c97a874e82
commit
33b4dfc9d8
2 changed files with 30 additions and 0 deletions
|
@ -3,6 +3,11 @@ $(package)_version=664b8414f89612f2dfd35a9b679c345aa5389026
|
||||||
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
|
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
|
||||||
$(package)_file_name=$($(package)_version).tar.gz
|
$(package)_file_name=$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
|
$(package)_sha256_hash=62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
|
||||||
|
$(package)_patches=no_embed_git_rev.patch
|
||||||
|
|
||||||
|
define $(package)_preprocess_cmds
|
||||||
|
patch -p1 -i $($(package)_patch_dir)/no_embed_git_rev.patch
|
||||||
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
CC=$(clang_prog) CXX=$(clangxx_prog) INSTALLPREFIX=$($(package)_staging_prefix_dir) ./build.sh
|
CC=$(clang_prog) CXX=$(clangxx_prog) INSTALLPREFIX=$($(package)_staging_prefix_dir) ./build.sh
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git a/src/llvm/CMakeLists.txt b/src/llvm/CMakeLists.txt
|
||||||
|
index ab92717c8..dff3a292a 100644
|
||||||
|
--- a/src/llvm/CMakeLists.txt
|
||||||
|
+++ b/src/llvm/CMakeLists.txt
|
||||||
|
@@ -754,7 +754,6 @@ set(LLVM_SRPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/srpm")
|
||||||
|
|
||||||
|
# SVN_REVISION and GIT_COMMIT get set by the call to add_version_info_from_vcs.
|
||||||
|
# DUMMY_VAR contains a version string which we don't care about.
|
||||||
|
-add_version_info_from_vcs(DUMMY_VAR)
|
||||||
|
if ( SVN_REVISION )
|
||||||
|
set(LLVM_RPM_SPEC_REVISION "r${SVN_REVISION}")
|
||||||
|
elseif ( GIT_COMMIT )
|
||||||
|
diff --git a/src/llvm/cmake/modules/GenerateVersionFromCVS.cmake b/src/llvm/cmake/modules/GenerateVersionFromCVS.cmake
|
||||||
|
index 6b1c71983..e16326ed6 100644
|
||||||
|
--- a/src/llvm/cmake/modules/GenerateVersionFromCVS.cmake
|
||||||
|
+++ b/src/llvm/cmake/modules/GenerateVersionFromCVS.cmake
|
||||||
|
@@ -24,7 +24,7 @@ include(VersionFromVCS)
|
||||||
|
set(ENV{TERM} "dumb")
|
||||||
|
|
||||||
|
function(append_info name path)
|
||||||
|
- add_version_info_from_vcs(REVISION ${path})
|
||||||
|
+ set(REVISION "git-0000000")
|
||||||
|
string(STRIP "${REVISION}" REVISION)
|
||||||
|
file(APPEND "${HEADER_FILE}.txt"
|
||||||
|
"#define ${name} \"${REVISION}\"\n")
|
Loading…
Reference in a new issue