diff options
| author | alpine-mips-patches <info@mobile-stream.com> | 2018-12-03 10:26:30 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-12-17 07:40:12 +0000 |
| commit | b7b4370cceb37679736c004559498275c20c608f (patch) | |
| tree | adda18b0ca1ae74d8dc29f1f900f0ef42449773b /community | |
| parent | 5e3ace2c1be097bff9db50d239dea6405fdfe8d4 (diff) | |
| download | aports-b7b4370cceb37679736c004559498275c20c608f.tar.bz2 aports-b7b4370cceb37679736c004559498275c20c608f.tar.xz | |
community/neko: fix build without git installed
Remove all targets that depend on git (source_archive and friends),
none of them are used during normal build.
Diffstat (limited to 'community')
| -rw-r--r-- | community/neko/APKBUILD | 9 | ||||
| -rw-r--r-- | community/neko/remove-git-dependent-targets.patch | 110 |
2 files changed, 116 insertions, 3 deletions
diff --git a/community/neko/APKBUILD b/community/neko/APKBUILD index e5e3015d10..f6953af279 100644 --- a/community/neko/APKBUILD +++ b/community/neko/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Li <andy@onthewings.net> pkgname=neko pkgver=2.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="High-level dynamically typed programming language" url="https://nekovm.org/" arch="all" @@ -15,7 +15,9 @@ options="" install="" subpackages="$pkgname-dev $pkgname-libs $pkgname-mysql $pkgname-ui $pkgname-apache2" -source="$pkgname-$pkgver.tar.gz::https://github.com/HaxeFoundation/neko/archive/v${pkgver//./-}.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/HaxeFoundation/neko/archive/v${pkgver//./-}.tar.gz + remove-git-dependent-targets.patch + " builddir="$srcdir/$pkgname-${pkgver//./-}" build() { @@ -65,4 +67,5 @@ apache2() { _mv_ndll mod_neko2 mod_tora2 } -sha512sums="4bc89fddf4a5ae94e73843b06a3b6fe8de59d72922764276a5bd9d56daf6570525e842039bf704598b41e1de4a5fe08931adc4ca9730fe3333be0beb7a1ccaed neko-2.2.0.tar.gz" +sha512sums="4bc89fddf4a5ae94e73843b06a3b6fe8de59d72922764276a5bd9d56daf6570525e842039bf704598b41e1de4a5fe08931adc4ca9730fe3333be0beb7a1ccaed neko-2.2.0.tar.gz +ed1aa657b385df7764b8e3a36edd56e7844ba0d326f79a48ab48f1b88868f3e4529e0e84f0dc9eeaae03e6b00fb2e7253afa10b2d56d677844cdbe9c72b81cc3 remove-git-dependent-targets.patch" diff --git a/community/neko/remove-git-dependent-targets.patch b/community/neko/remove-git-dependent-targets.patch new file mode 100644 index 0000000000..f05d766d85 --- /dev/null +++ b/community/neko/remove-git-dependent-targets.patch @@ -0,0 +1,110 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,9 +194,6 @@ + find_package(PkgConfig REQUIRED) + endif() + +-# git is used for source_archive and for applying patch +-find_package(Git REQUIRED) +- + # copy the lib/src folder to build directory + # (if it is a fat archive, there will be external libraries) + if(EXISTS ${CMAKE_SOURCE_DIR}/libs/src) +@@ -524,56 +521,6 @@ + + ####################### + +-# source_archive +-# We create our own source package target instead of using CPack's package_source. +-# One reason is that the CPack VS generator doesn't generate package_source target. +-# See https://cmake.org/Bug/view.php?id=13058 +- +-if (WIN32) +- set(source_archive_format zip) +-else() +- set(source_archive_format tar.gz) +-endif() +- +-set(source_archive_name_we neko-${NEKO_VERSION}-src) +-set(source_archive_name ${source_archive_name_we}.${source_archive_format}) +- +-add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_name} +- COMMAND ${GIT_EXECUTABLE} archive --prefix=${source_archive_name_we}/ -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_name} HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- VERBATIM +-) +- +-add_custom_target(source_archive +- DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_name} +-) +- +-# source_archive_fat +-# It is source_archive + STATIC_DEPS placed in libs/src. +- +-set(source_archive_fat_name_we neko-${NEKO_VERSION}-src-fat) +-set(source_archive_fat_name ${source_archive_fat_name_we}.${source_archive_format}) +- +-add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_fat_name} +- COMMAND ${CMAKE_COMMAND} +- -Dsource_archive_name_we=${source_archive_name_we} +- -Dsource_archive=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_name} +- -Dsource_archive_fat_name_we=${source_archive_fat_name_we} +- -Dsource_archive_fat_name=${source_archive_fat_name} +- -Dbin_dir=${CMAKE_BINARY_DIR} +- -Dsrc_dir=${CMAKE_SOURCE_DIR} +- -Dlib_src_dir=libs/src +- -P ${CMAKE_SOURCE_DIR}/cmake/source_archive_fat.cmake +- DEPENDS source_archive download_static_deps +- VERBATIM +-) +- +-add_custom_target(source_archive_fat +- DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_fat_name} +-) +- +-####################### +- + # install target + + if (WIN32) +@@ -811,40 +758,6 @@ + set_tests_properties(-version test.n nekoc nekotools + PROPERTIES + ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +- ) +-endif() +- +- +-####################### +- +-# debian source packages +- +-if(UNIX AND NOT APPLE) +- add_custom_target(upload_to_ppa +- COMMAND ${CMAKE_COMMAND} +- -Dsource_dir=${CMAKE_SOURCE_DIR} +- -Dbin_dir=${CMAKE_BINARY_DIR} +- -Dsource_archive=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source_archive_fat_name} +- -DNEKO_VERSION=${NEKO_VERSION} +- -P ${CMAKE_SOURCE_DIR}/cmake/upload_to_ppa.cmake +- DEPENDS source_archive_fat +- ) +-endif() +- +- +-####################### +- +-# chocolatey +-if(WIN32) +- add_custom_target(package_choco +- COMMAND ${CMAKE_COMMAND} +- -Dsource_dir=${CMAKE_SOURCE_DIR} +- -Dbin_dir=${CMAKE_BINARY_DIR} +- -Dbin_archive=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${bin_archive_name} +- -Dbin_archive_name_we=${bin_archive_name_we} +- -DNEKO_VERSION=${NEKO_VERSION} +- -P ${CMAKE_SOURCE_DIR}/cmake/package_choco.cmake +- DEPENDS package + ) + endif() + |