Skip to content

Commit

Permalink
Disable WinRPM
Browse files Browse the repository at this point in the history
  • Loading branch information
eschnett committed Aug 21, 2018
1 parent c1c5971 commit 8fc7990
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@osx Homebrew
@windows WinRPM
# @windows WinRPM
BinDeps
julia 0.7
27 changes: 16 additions & 11 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,22 @@ if Sys.islinux()
provides(Yum, "hwloc-devel", libhwloc, os=:Linux)
end

if Sys.iswindows()
using WinRPM
provides(WinRPM.RPM, "hwloc", libhwloc, os=:Windows)
end

# provides(Binaries,
# URI("http://www.open-mpi.org/software/hwloc/v2.0/downloads/" *
# "hwloc-win$(Base.Sys.WORD_SIZE)-build-2.0.1.zip"),
# [libhwloc],
# unpacked_dir="hwloc-win$(Base.Sys.WORD_SIZE)-build-2.0.1/bin",
# os = :Windows)
# WinRPM on 32-bit Windows says:
# "Your platform i686-w64-mingw32 is not supported by this package!"
# WinRPM on 64-bit Windows says:
# "None of the selected providers can install dependency libhwloc."
#
# if Sys.iswindows()
# using WinRPM
# provides(WinRPM.RPM, "hwloc", libhwloc, os=:Windows)
# end

provides(Binaries,
URI("http://www.open-mpi.org/software/hwloc/v2.0/downloads/" *
"hwloc-win$(Base.Sys.WORD_SIZE)-build-2.0.1.zip"),
[libhwloc],
unpacked_dir="hwloc-win$(Base.Sys.WORD_SIZE)-build-2.0.1/bin",
os = :Windows)

# Build from source
provides(Sources,
Expand Down

0 comments on commit 8fc7990

Please sign in to comment.