See https://github.com/NixOS/nixpkgs/pull/82131 for the rest of the changes for FreeBSD. This is PRed separately because it is a macOS moderate rebuild so we target staging. The main change is that we CD to the path we're building *after* applying patches, so we can patch other parts of the tree (from `extraPaths`) as needed. Another change is that `netbsd.install` no longer depends on `fts`, which it evidently no longer needs.
19 lines
416 B
Diff
19 lines
416 B
Diff
diff -u -r1.35.2.1 nbtool_config.h.in
|
|
--- a/tools/compat/nbtool_config.h.in 22 Apr 2015 07:18:58 -0000 1.35.2.1
|
|
+++ b/tools/compat/nbtool_config.h.in 31 May 2018 01:46:53 -0000
|
|
@@ -680,5 +680,14 @@
|
|
/* Define if you have u_int8_t, but not uint8_t. */
|
|
#undef uint8_t
|
|
|
|
+#ifdef __cplusplus
|
|
+extern "C" {
|
|
+#endif
|
|
+
|
|
#include "compat_defs.h"
|
|
+
|
|
+#ifdef __cplusplus
|
|
+}
|
|
+#endif
|
|
+
|
|
#endif /* !__NETBSD_NBTOOL_CONFIG_H__ */
|