From bef6a3d22a3d60c1fb9bd6b70f54b4e5a302e273 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 30 Dec 2020 19:35:39 +0100 Subject: [PATCH] Make build reproducible eade31a68ec7 ("Honor environment variables passed at ./configure") made speech_tools record build flags in user_flags.mak. This however make the build less reproducible by recording flags from the environment. Also, external applications using it do not actually need to get flags from that, they can just inherit them from their own environment. Actually, I'd even argue that this is preferrable over seeing speech_tools hardcode flags that applications using its build system will then have to use. --- config/Makefile | 4 +-- config/compilers/gcc_defaults.mak | 2 +- config/config.in | 2 -- config/rules/defaults.mak | 6 ++-- config/user_flags.mak.in | 48 ------------------------------- configure | 3 +- configure.ac | 2 +- 7 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 config/user_flags.mak.in diff --git a/config/Makefile b/config/Makefile index ecb75c4..7e1f4e7 100644 --- a/config/Makefile +++ b/config/Makefile @@ -40,11 +40,11 @@ DIRNAME=config FILES = Makefile ReadMe example.Makefile example.module.mak\ common_make_rules test_make_rules vc_common_make_rules \ config.in vc_config_make_rules-dist \ - project.mak system.sh make_system.mak user_flags.mak + project.mak system.sh make_system.mak #LOCAL_CLEAN = modinclude*.inc system.mak -LOCAL_DISTCLEAN = modinclude*.inc system.mak config user_flags.mak +LOCAL_DISTCLEAN = modinclude*.inc system.mak config ALL_DIRS = systems compilers rules configs modules diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak index 1f132d4..1e279e1 100644 --- a/config/compilers/gcc_defaults.mak +++ b/config/compilers/gcc_defaults.mak @@ -78,7 +78,7 @@ SHARED_LINKFLAGS = ifndef GCC_MAKE_SHARED_LIB # Older versions of gcc might have required -fno-shared-data # MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX - MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY $(USER_LINKFLAGS) + MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY $(LDFLAGS) else MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) endif diff --git a/config/config.in b/config/config.in index c0433b1..9540aaf 100644 --- a/config/config.in +++ b/config/config.in @@ -217,8 +217,6 @@ include $(EST)/config/systems/$(SYSTEM_TYPE).mak include $(EST)/config/compilers/$(COMPILER).mak -include $(EST)/config/user_flags.mak - ifneq ($(JAVA_COMPILER),none) include $(EST)/config/compilers/$(JAVA_COMPILER).mak endif diff --git a/config/rules/defaults.mak b/config/rules/defaults.mak index 17a1054..773af10 100644 --- a/config/rules/defaults.mak +++ b/config/rules/defaults.mak @@ -173,13 +173,13 @@ endif ## Default C Compilation ifndef CC_COMMAND - CC_COMMAND = $(CC) -c $(CFLAGS) $(COMPILE_CCFLAGS) $(DEFINES) $(INCLUDES) $(USER_CPPFLAGS) $(USER_CFLAGS) + CC_COMMAND = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(COMPILE_CCFLAGS) $(DEFINES) $(INCLUDES) endif ## Default C++ Compilation ifndef CXX_COMMAND - CXX_COMMAND = $(CXX) -c $(CXXFLAGS) $(COMPILE_CXXFLAGS) $(DEFINES) $(INCLUDES) $(TEMPLATES) $(USER_CPPFLAGS) $(USER_CXXFLAGS) + CXX_COMMAND = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(COMPILE_CXXFLAGS) $(DEFINES) $(INCLUDES) $(TEMPLATES) endif ## C++ for dynamic loading @@ -205,6 +205,6 @@ endif ## Link a program (not including libraries) ifndef LINK_COMMAND - LINK_COMMAND = $(CXX) $(LINKFLAGS) $(TEMPLATES) $(USER_LINKFLAGS) + LINK_COMMAND = $(CXX) $(LINKFLAGS) $(TEMPLATES) $(LDFLAGS) endif diff --git a/config/user_flags.mak.in b/config/user_flags.mak.in deleted file mode 100644 index adb314d..0000000 --- a/config/user_flags.mak.in +++ /dev/null @@ -1,48 +0,0 @@ -########################################################################### -## ## -## Centre for Speech Technology Research ## -## University of Edinburgh, UK ## -## Copyright (c) 1996 ## -## All Rights Reserved. ## -## ## -## Permission is hereby granted, free of charge, to use and distribute ## -## this software and its documentation without restriction, including ## -## without limitation the rights to use, copy, modify, merge, publish, ## -## distribute, sublicense, and/or sell copies of this work, and to ## -## permit persons to whom this work is furnished to do so, subject to ## -## the following conditions: ## -## 1. The code must retain the above copyright notice, this list of ## -## conditions and the following disclaimer. ## -## 2. Any modifications must be clearly marked as such. ## -## 3. Original authors' names are not deleted. ## -## 4. The authors' names are not used to endorse or promote products ## -## derived from this software without specific prior written ## -## permission. ## -## ## -## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## -## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## -## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -## THIS SOFTWARE. ## -## ## -########################################################################### -## ## -## Author: Sergio Oller ## -## Date: Jan 6 2014 ## -## -------------------------------------------------------------------- ## -## Settings for compiler defined via autoconf ## -## ## -########################################################################### - -USER_CFLAGS = @CFLAGS@ -USER_CPPFLAGS = @CPPFLAGS@ -USER_CXXFLAGS = @CXXFLAGS@ -USER_LINKFLAGS = @LDFLAGS@ - -CC = @CC@ -CXX = @CXX@ - diff --git a/configure b/configure index 20833b5..f5f11b4 100755 --- a/configure +++ b/configure @@ -4394,7 +4394,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_config_files="$ac_config_files config/config config/user_flags.mak" +ac_config_files="$ac_config_files config/config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5103,7 +5103,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config/config") CONFIG_FILES="$CONFIG_FILES config/config" ;; - "config/user_flags.mak") CONFIG_FILES="$CONFIG_FILES config/user_flags.mak" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index f67749a..4d2a806 100644 --- a/configure.ac +++ b/configure.ac @@ -153,5 +153,5 @@ OMP_DEFS= AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ int j=1;]])],[OMP_DEFS="-DOMP_WAGON=1"],[]) AC_SUBST(OMP_DEFS) -AC_CONFIG_FILES([config/config config/user_flags.mak]) +AC_CONFIG_FILES([config/config]) AC_OUTPUT