Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-base: fix build on Solaris 11.4. Quell pkglint while here.
- Loading branch information
Showing
8 changed files
with
83 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,15 @@ | ||
$NetBSD: distinfo,v 1.135 2023/06/09 12:05:14 riastradh Exp $ | ||
$NetBSD: distinfo,v 1.136 2023/06/12 21:41:59 schmonz Exp $ | ||
|
||
BLAKE2s (git-2.41.0.tar.xz) = 9386094f11cc329ebb801be45dad6f2de9c8d192e21ba2fbe37444821fcdb93b | ||
SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 | ||
Size (git-2.41.0.tar.xz) = 7273624 bytes | ||
SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa | ||
SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72 | ||
SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 | ||
SHA1 (patch-cache.h) = c86918cd97697208835f92c3b9d0bebd81b13dd8 | ||
SHA1 (patch-config.mak.uname) = c5985af246310023f63c7b8a9cebef84f53769f7 | ||
SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e | ||
SHA1 (patch-dir.h) = 37593de2f91933a5708996d1e575bd49fa290cc0 | ||
SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d | ||
SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 | ||
SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 | ||
SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | ||
SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0 | ||
SHA1 (patch-templates_Makefile) = 0fe03748644aafbd0263c050242eba90ddba11c7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
$NetBSD: patch-cache.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $ | ||
|
||
Include compat definitions to fix Solaris 11.4 build. | ||
|
||
--- cache.h.orig 2023-06-12 21:28:27.007644652 +0000 | ||
+++ cache.h | ||
@@ -7,6 +7,7 @@ | ||
#include "pathspec.h" | ||
#include "object.h" | ||
#include "statinfo.h" | ||
+#include "dircompat.h" | ||
|
||
/* | ||
* Basic data structures for the directory cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
$NetBSD: patch-dir.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $ | ||
|
||
Extract compat definitions for easy inclusion elsewhere. | ||
|
||
--- dir.h.orig 2023-06-12 21:25:12.673262635 +0000 | ||
+++ dir.h | ||
@@ -641,18 +641,6 @@ static inline int starts_with_dot_dot_sl | ||
return path_match_flags(path, what | PATH_MATCH_NATIVE); | ||
} | ||
|
||
-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT) | ||
-#define DTYPE(de) ((de)->d_type) | ||
-#else | ||
-#undef DT_UNKNOWN | ||
-#undef DT_DIR | ||
-#undef DT_REG | ||
-#undef DT_LNK | ||
-#define DT_UNKNOWN 0 | ||
-#define DT_DIR 1 | ||
-#define DT_REG 2 | ||
-#define DT_LNK 3 | ||
-#define DTYPE(de) DT_UNKNOWN | ||
-#endif | ||
+#include "dircompat.h" | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
$NetBSD: patch-dircompat.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $ | ||
|
||
Extract compat definitions for easy inclusion elsewhere. | ||
|
||
--- dircompat.h.orig 2023-06-12 21:24:40.055455063 +0000 | ||
+++ dircompat.h | ||
@@ -0,0 +1,18 @@ | ||
+#ifndef DIRCOMPAT_H | ||
+#define DIRCOMPAT_H | ||
+ | ||
+#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT) | ||
+#define DTYPE(de) ((de)->d_type) | ||
+#else | ||
+#undef DT_UNKNOWN | ||
+#undef DT_DIR | ||
+#undef DT_REG | ||
+#undef DT_LNK | ||
+#define DT_UNKNOWN 0 | ||
+#define DT_DIR 1 | ||
+#define DT_REG 2 | ||
+#define DT_LNK 3 | ||
+#define DTYPE(de) DT_UNKNOWN | ||
+#endif | ||
+ | ||
+#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters