NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "reproducible: fix DATE/TIME macros in toolchain-wrapper"

Browse Source 
This reverts commit 76838f6341.

The commit referenced above explicitly states that the function was
copied as-is from the gcc source code at the time. And indeed that is
exactly how the function appeared in gcc in commit
e3e8c48c4a494d9da741c1c8ea6c4c0b7c4ff934.

However, our toolchain wrapper is "GPLv2 only", while the file this function
was copied from is "GPLv3 or later".  As such we can't include that function
and still comply to both licenses.

Furthermore, the code is far from optimum.

Since this feature is not release-critical, revert it until we re-implement
it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jérôme Pouiller <jezz@sysmic.org>
Cc: Samuel Martin <s.martin49@gmail.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2017-02-20 18:16:31 +01:00 committed by Peter Korsgaard
parent 2e19aad44a
commit 1c8c0d91a4
1 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
toolchain/toolchain-wrapper.c
View File

@ -22,15 +22,12 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <time.h>
#ifdef BR_CCACHE #ifdef BR_CCACHE
static char ccache_path[PATH_MAX]; static char ccache_path[PATH_MAX];
#endif #endif
static char path[PATH_MAX]; static char path[PATH_MAX];
static char sysroot[PATH_MAX]; static char sysroot[PATH_MAX];
static char source_time[sizeof("-D__TIME__=\"HH:MM:SS\"")];
static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")];
/** /**
* GCC errors out with certain combinations of arguments (examples are * GCC errors out with certain combinations of arguments (examples are
@ -42,11 +39,8 @@ static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")];
* -mfloat-abi= * -mfloat-abi=
* -march= * -march=
* -mcpu= * -mcpu=
* -D__TIME__=
* -D__DATE__=
* -Wno-builtin-macro-redefined
*/ */
#define EXCLUSIVE_ARGS 6 #define EXCLUSIVE_ARGS 3
static char *predef_args[] = { static char *predef_args[] = {
#ifdef BR_CCACHE #ifdef BR_CCACHE
@ -163,47 +157,6 @@ static void check_unsafe_path(const char *arg,
} }
} }
/* Read SOURCE_DATE_EPOCH from environment to have a deterministic
* timestamp to replace embedded current dates to get reproducible
* results. Returns -1 if SOURCE_DATE_EPOCH is not defined.
*/
static time_t get_source_date_epoch()
{
char *source_date_epoch;
long long epoch;
char *endptr;
source_date_epoch = getenv("SOURCE_DATE_EPOCH");
if (!source_date_epoch)
return (time_t) -1;
errno = 0;
epoch = strtoll(source_date_epoch, &endptr, 10);
if ((errno == ERANGE && (epoch == LLONG_MAX || epoch == LLONG_MIN))
|| (errno != 0 && epoch == 0)) {
fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: "
"strtoll: %s\n", strerror(errno));
exit(2);
}
if (endptr == source_date_epoch) {
fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: "
"no digits were found: %s\n", endptr);
exit(2);
}
if (*endptr != '\0') {
fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: "
"trailing garbage: %s\n", endptr);
exit(2);
}
if (epoch < 0) {
fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: "
"value must be nonnegative: %lld \n", epoch);
exit(2);
}
return (time_t) epoch;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char **args, **cur, **exec_args; char **args, **cur, **exec_args;
@ -214,7 +167,6 @@ int main(int argc, char **argv)
char *paranoid_wrapper; char *paranoid_wrapper;
int paranoid; int paranoid;
int ret, i, count = 0, debug; int ret, i, count = 0, debug;
time_t source_date_epoch;
/* Calculate the relative paths */ /* Calculate the relative paths */
basename = strrchr(progpath, '/'); basename = strrchr(progpath, '/');
@ -320,28 +272,6 @@ int main(int argc, char **argv)
} }
#endif /* ARCH || CPU */ #endif /* ARCH || CPU */
source_date_epoch = get_source_date_epoch();
if (source_date_epoch != -1) {
struct tm *tm = localtime(&source_date_epoch);
if (!tm) {
perror("__FILE__: localtime");
return 3;
}
ret = strftime(source_time, sizeof(source_time), "-D__TIME__=\"%T\"", tm);
if (!ret) {
perror("__FILE__: overflow");
return 3;
}
*cur++ = source_time;
ret = strftime(source_date, sizeof(source_date), "-D__DATE__=\"%b %e %Y\"", tm);
if (!ret) {
perror("__FILE__: overflow");
return 3;
}
*cur++ = source_date;
*cur++ = "-Wno-builtin-macro-redefined";
}
paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) if (paranoid_wrapper && strlen(paranoid_wrapper) > 0)
paranoid = 1; paranoid = 1;