diff options
| author | Michael Kuc | 2020-12-12 21:15:26 +0000 |
|---|---|---|
| committer | Michael Kuc | 2020-12-12 21:15:26 +0000 |
| commit | addff7444ff0e78f906957314523fad52b2afa99 (patch) | |
| tree | 16c6739ac0864bb811f9584d2cf2f82162c77f32 | |
| parent | 8240cf37675b07a481c6f470126aa9c36abdb791 (diff) | |
| download | aur-thrill-git.tar.gz | |
Fix system header files not being installed.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | CMakeLists.txt.patch | 16 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 24 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = thrill-git pkgdesc = Thrill is an EXPERIMENTAL C++ framework for algorithmic distributed Big Data batch computations on a cluster of machines. pkgver = 12c5b59bc - pkgrel = 2 + pkgrel = 3 epoch = 1 url = https://github.com/thrill/thrill arch = x86_64 @@ -11,8 +11,10 @@ pkgbase = thrill-git conflicts = thrill source = thrill::git+https://github.com/thrill/thrill.git source = foxxll_CMakeLists.txt.patch + source = CMakeLists.txt.patch sha256sums = SKIP sha256sums = d6fae47a05ee842dbc68568f2da22de01d3f7035a2993bde54cd3dd8486750b4 + sha256sums = 33904298e627307a145eb6e998ca931c87c1a6b039cafb6f6318562004b27a61 pkgname = thrill-git diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch new file mode 100644 index 000000000000..d0ffdf07a70f --- /dev/null +++ b/CMakeLists.txt.patch @@ -0,0 +1,16 @@ +*** src/thrill/thrill/CMakeLists.txt 2020-12-12 18:07:24.931331282 +0000 +--- CMakeLists.txt 2020-12-12 20:32:33.608554570 +0000 +*************** +*** 48,51 **** +--- 48,58 ---- + target_include_directories(thrill SYSTEM PUBLIC ${THRILL_INCLUDE_DIRS}) + target_link_libraries(thrill ${THRILL_LINK_LIBRARIES}) + ++ set(THRILL_HEADERS ${THRILL_SRCS}) ++ list(FILTER THRILL_HEADERS INCLUDE REGEX "\\.hpp") ++ ++ set_target_properties(thrill PROPERTIES PUBLIC_HEADER "${THRILL_HEADERS}") ++ ++ INSTALL(TARGETS thrill LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include/thrill) ++ + ################################################################################ @@ -2,7 +2,7 @@ _pkgname=thrill pkgname=${_pkgname}-git pkgver=12c5b59bc -pkgrel=2 +pkgrel=3 pkgdesc="Thrill is an EXPERIMENTAL C++ framework for algorithmic distributed Big Data batch computations on a cluster of machines." arch=('x86_64') url="https://github.com/thrill/thrill" @@ -11,10 +11,11 @@ depends=('cmake') provides=("${_pkgname}") conflicts=("${_pkgname}") epoch=1 -source=("${_pkgname}::git+https://github.com/thrill/thrill.git" "foxxll_CMakeLists.txt.patch") +source=("${_pkgname}::git+https://github.com/thrill/thrill.git" 'foxxll_CMakeLists.txt.patch' 'CMakeLists.txt.patch') sha256sums=( 'SKIP' 'd6fae47a05ee842dbc68568f2da22de01d3f7035a2993bde54cd3dd8486750b4' + '33904298e627307a145eb6e998ca931c87c1a6b039cafb6f6318562004b27a61' ) pkgver() { @@ -23,9 +24,10 @@ pkgver() { } prepare() { - patch -p1 < foxxll_CMakeLists.txt.patch cd "${srcdir}/${_pkgname}" git submodule update --init --recursive + patch -p2 -Nf < ../foxxll_CMakeLists.txt.patch + patch -p2 -Nf < ../CMakeLists.txt.patch mkdir -p build cd build cmake -DTHRILL_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDE_DIR=/usr/include .. |