From 5f83ef992532462cecd95deb6de4d978cc9a1d5a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 30 Mar 2016 15:48:52 +0200 Subject: [PATCH] build: drop internal field __nm_git_sha from libraries The problem is that you cannot be sure which patches were applied on top of a source tree, so the __nm_git_sha value is unreliable. Also, after running autoreconf during the package build, NM_GIT_SHA is reset as well. --- libnm-core/nm-utils.c | 5 ----- libnm-util/nm-utils.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index a84670810..70c268faa 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -45,9 +45,6 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" -/* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; - /** * SECTION:nm-utils * @short_description: Utility functions @@ -223,8 +220,6 @@ _nm_utils_init (void) GModule *self; gpointer func; - (void) __nm_git_sha; - if (initialized) return; initialized = TRUE; diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 084f0f548..717260af2 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -37,9 +37,6 @@ #include "nm-setting-private.h" #include "crypto.h" -/* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; - /** * SECTION:nm-utils * @short_description: Utility functions @@ -234,8 +231,6 @@ static gboolean initialized = FALSE; gboolean nm_utils_init (GError **error) { - (void) __nm_git_sha; - if (!initialized) { initialized = TRUE; -- 2.17.1