mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
ae9d917760
Set make flags also on BUILD(), otherwise tzselect ended up with the wrong location for TZDIR. Previous version failed with: `/bin/tzselect: time zone files are not set up correctly` Now it finds the files ok, but trying to use it further causes /bin/date to crash around 7 times in a row (?! UPDATE: fixed in hrev57356). `> zdump -v America/Buenos_Aires` also works now, while previously failed with: `America/Buenos_Aires: No such file or directory`, or with: ``` > ln -s /boot/system/data/zoneinfo/America/Buenos_Aires /etc/localtime > zdump -v /etc/localtime /etc/localtime: No error ``` Now the latter also works OK.
53 lines
1.9 KiB
Plaintext
53 lines
1.9 KiB
Plaintext
From 45d6570d90bb9b04a55f59e92db9cf53c9ee4f93 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 24 Feb 2022 18:49:00 +0100
|
|
Subject: applying patch timezone_data-2021e.patch
|
|
|
|
|
|
diff --git a/zic.c b/zic.c
|
|
index 5518051..7f8bb11 100644
|
|
--- a/zic.c
|
|
+++ b/zic.c
|
|
@@ -1456,7 +1456,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
|
|
break;
|
|
}
|
|
link_errno = errno;
|
|
- if (link_errno == EXDEV || link_errno == ENOTSUP)
|
|
+ if (link_errno == EXDEV || link_errno == ENOTSUP || link_errno == B_UNSUPPORTED)
|
|
break;
|
|
|
|
if (link_errno == EEXIST) {
|
|
@@ -1468,9 +1468,9 @@ dolink(char const *target, char const *linkname, bool staysymlink)
|
|
mkdirs(linkname, true);
|
|
linkdirs_made = true;
|
|
} else {
|
|
- fprintf(stderr, _("%s: Can't link %s/%s to %s/%s: %s\n"),
|
|
+ fprintf(stderr, _("%s: Can't link %s/%s to %s/%s: %s %x\n"),
|
|
progname, directory, target, directory, outname,
|
|
- strerror(link_errno));
|
|
+ strerror(link_errno), link_errno);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
@@ -1496,7 +1496,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
|
|
}
|
|
free(linkalloc);
|
|
if (symlink_errno == 0) {
|
|
- if (link_errno != ENOTSUP && link_errno != EEXIST)
|
|
+ if (link_errno != ENOTSUP && link_errno !=B_UNSUPPORTED && link_errno != EEXIST)
|
|
warning(_("symbolic link used because hard link failed: %s"),
|
|
strerror(link_errno));
|
|
} else {
|
|
@@ -1514,7 +1514,7 @@ dolink(char const *target, char const *linkname, bool staysymlink)
|
|
putc(c, tp);
|
|
close_file(tp, directory, linkname, tempname);
|
|
close_file(fp, directory, target, NULL);
|
|
- if (link_errno != ENOTSUP)
|
|
+ if (link_errno != ENOTSUP && link_errno != B_UNSUPPORTED)
|
|
warning(_("copy used because hard link failed: %s"),
|
|
strerror(link_errno));
|
|
else if (symlink_errno != ENOTSUP)
|
|
--
|
|
2.37.3
|
|
|