Skip to content

Commit 69f5596

Browse files
authored
Merge pull request #12445 from bwbarrett/bugfix/libevent-autotools-version
libevent: Update autotools versions
2 parents 2911d48 + b85957e commit 69f5596

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed
1.05 MB
Binary file not shown.
-1.05 MB
Binary file not shown.

autogen.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
my $ompi_libtoolize_search = "libtoolize;glibtoolize";
7272

7373
# version of packages we ship as tarballs
74-
my $libevent_version="2.1.12-stable";
74+
my $libevent_version="2.1.12-stable-ompi";
7575
my $hwloc_version="2.7.1";
7676

7777
# One-time setup

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ def get_tarball_version(path, expr):
7878
prte_data = read_version_file(f"{ompi_top_srcdir}/3rd-party/prrte/VERSION")
7979

8080
hwloc_embedded_version = get_tarball_version(f"{ompi_top_srcdir}/3rd-party/",
81-
r"hwloc-(.*).tar")
81+
r"hwloc-([^-]+).*\.tar")
8282
event_embedded_version = get_tarball_version(f"{ompi_top_srcdir}/3rd-party/",
83-
r"libevent-(.*)-stable.tar")
83+
r"libevent-([^-]+).*\.tar")
8484

8585
# ---------------------------
8686

0 commit comments

Comments
 (0)