summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2015-12-27 09:44:13 +0100
committernfnty2015-12-27 09:44:13 +0100
commitb5e008c222f0afa8b837134aee0d26010a2eb993 (patch)
treee553c7e71e59cd9435dd12c35300dc60b51a7e54
parent6791d4f06a89f73edb75d5c7ca73fc82d03b0bc2 (diff)
downloadaur-b5e008c222f0afa8b837134aee0d26010a2eb993.tar.gz
Updated patch
-rw-r--r--PKGBUILD2
-rw-r--r--cmake.patch12
2 files changed, 1 insertions, 13 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1174f0d57f33..d1b34057529b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,7 +59,7 @@ build() {
-DCMAKE_BUILD_TYPE='release' \
-DCMAKE_INSTALL_PREFIX='/usr' \
..
- make -j 1
+ make
}
package() {
diff --git a/cmake.patch b/cmake.patch
index f16f80e51c31..efb74661513e 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -10,15 +10,3 @@ index dfabba7..c1a0ffc 100644
set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka")
set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka")
set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include")
-@@ -285,9 +284,9 @@ endif()
- if (INCLUDE_MOZSVC)
- add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins)
- endif()
--install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- if(INCLUDE_SANDBOX)
--install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- endif()
- install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}")
- install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}")