Skip to content

Commit

Permalink
VERSION: prepare for 2.10.0rc1
Browse files Browse the repository at this point in the history
Bump soname to 22:0:7 (vs 21:4:6 for 2.9.3),

Reuse AM 1.16.5, and AC 2.71, and LT to 2.4.7.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Nov 9, 2023
1 parent c806302 commit 0888b51
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions VERSION
Expand Up @@ -18,7 +18,7 @@ release=0
# requirement is that it must be entirely printable ASCII characters
# and have no white space.

greek=a1
greek=rc1

# The date when this release was created

Expand All @@ -41,6 +41,6 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
# 2. Version numbers are described in the Libtool current:revision:age
# format.

libhwloc_so_version=0:0:0
libhwloc_so_version=22:0:7

# Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj
2 changes: 1 addition & 1 deletion contrib/android/AndroidApp/lstopo/build.gradle
Expand Up @@ -11,7 +11,7 @@ android {
// Official hwloc version - snapshot number - android apk version
// Set snapshot number to 1 when the hwloc version is increased.
// Increase the snapshot number when the hwloc code changed but not its version
versionName "2.10.0a1-1-1.5.3"
versionName "2.10.0rc1-1-1.5.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
Expand Down
4 changes: 2 additions & 2 deletions contrib/android/include/hwloc/autogen/config.h
Expand Up @@ -12,11 +12,11 @@
#ifndef HWLOC_CONFIG_H
#define HWLOC_CONFIG_H

#define HWLOC_VERSION "2.10.0a1"
#define HWLOC_VERSION "2.10.0rc1"
#define HWLOC_VERSION_MAJOR 2
#define HWLOC_VERSION_MINOR 10
#define HWLOC_VERSION_RELEASE 0
#define HWLOC_VERSION_GREEK "a1"
#define HWLOC_VERSION_GREEK "rc1"

#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
# define __hwloc_restrict __restrict
Expand Down
6 changes: 3 additions & 3 deletions contrib/dist/make_dist_tarball
Expand Up @@ -27,9 +27,9 @@
# Version of auto tools that we want
#

AM_TARGET_VERSION=1.14.1
AC_TARGET_VERSION=2.69
LT_TARGET_VERSION=2.4.2
AM_TARGET_VERSION=1.16.5
AC_TARGET_VERSION=2.71
LT_TARGET_VERSION=2.4.7

#
# First things first -- check that the auto versions that we have are
Expand Down
4 changes: 2 additions & 2 deletions contrib/windows/hwloc_config.h
Expand Up @@ -11,11 +11,11 @@
#ifndef HWLOC_CONFIG_H
#define HWLOC_CONFIG_H

#define HWLOC_VERSION "2.10.0a1"
#define HWLOC_VERSION "2.10.0rc1"
#define HWLOC_VERSION_MAJOR 2
#define HWLOC_VERSION_MINOR 10
#define HWLOC_VERSION_RELEASE 0
#define HWLOC_VERSION_GREEK "a1"
#define HWLOC_VERSION_GREEK "rc1"

#define __hwloc_restrict
#define __hwloc_inline __inline
Expand Down

0 comments on commit 0888b51

Please sign in to comment.