diff options
| author | Manuel Bentele | 2020-09-10 13:30:47 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2020-09-16 07:37:56 +0200 |
| commit | 1dd2c3999236595a5f6cebdf35dfe7536ff5c34d (patch) | |
| tree | 75b42c0631cb78ae9b0ce2a817399f8095bc6b07 /utils | |
| parent | Fixed major number of xloop device and device names in xlosetup (diff) | |
| download | xloop-1dd2c3999236595a5f6cebdf35dfe7536ff5c34d.tar.gz xloop-1dd2c3999236595a5f6cebdf35dfe7536ff5c34d.tar.xz xloop-1dd2c3999236595a5f6cebdf35dfe7536ff5c34d.zip | |
Generate util-linux configuration to build xlosetup
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | utils/config.h.in (renamed from utils/config.h) | 16 | ||||
| -rw-r--r-- | utils/libsmartcols/src/libsmartcols.h | 7 |
3 files changed, 14 insertions, 17 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index df83a7a..1388f2b 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -7,8 +7,12 @@ project(xloop-utils) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -# add include of config.h to each source file -add_compile_options(-include ${CMAKE_CURRENT_SOURCE_DIR}/config.h) +# prepare date for configuring config.h +string(TIMESTAMP DATE "%d-%b-%Y") + +# configure configuration config.h and add it to each source file +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/config.h) # add xloop specific compile options add_definitions(-DCONFIG_BLK_DEV_XLOOP_MIN_COUNT=${BLK_DEV_XLOOP_MIN_COUNT} -DXLOOP_MAJOR=${XLOOP_MAJOR}) diff --git a/utils/config.h b/utils/config.h.in index f74c162..40b8d34 100644 --- a/utils/config.h +++ b/utils/config.h.in @@ -694,19 +694,19 @@ /* #undef HAVE___SECURE_GETENV */ /* libblkid date string */ -#define LIBBLKID_DATE "23-Jul-2020" +#define LIBBLKID_DATE "@DATE@" /* libblkid version string */ -#define LIBBLKID_VERSION "2.36.97" +#define LIBBLKID_VERSION "@VERSION@" /* libfdisk version string */ -#define LIBFDISK_VERSION "2.36.97" +#define LIBFDISK_VERSION "@VERSION@" /* libmount version string */ -#define LIBMOUNT_VERSION "2.36.97" +#define LIBMOUNT_VERSION "@VERSION@" /* libsmartcols version string */ -#define LIBSMARTCOLS_VERSION "2.36.97" +#define LIBSMARTCOLS_VERSION "@VERSION@" /* Should login chown /dev/vcsN? */ /* #undef LOGIN_CHOWN_VCS */ @@ -736,7 +736,7 @@ #define PACKAGE_NAME "util-linux" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "util-linux 2.36.97-87ac5-dirty" +#define PACKAGE_STRING "util-linux @VERSION@" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "util-linux" @@ -745,7 +745,7 @@ #define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.36.97-87ac5" +#define PACKAGE_VERSION "@VERSION@" /* Should pg ring the bell on invalid keys? */ #define PG_BELL 1 @@ -848,7 +848,7 @@ /* #undef USE_VENDORDIR */ /* Version number of package */ -#define VERSION "2.36.97-87ac5" +#define VERSION "@VERSION@" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/utils/libsmartcols/src/libsmartcols.h b/utils/libsmartcols/src/libsmartcols.h index 2b2c08f..5714bfa 100644 --- a/utils/libsmartcols/src/libsmartcols.h +++ b/utils/libsmartcols/src/libsmartcols.h @@ -19,13 +19,6 @@ extern "C" { #include <sys/types.h> /** - * LIBSMARTCOLS_VERSION: - * - * Library version string - */ -#define LIBSMARTCOLS_VERSION "2.36.97" - -/** * libscols_iter: * * Generic iterator |