From 6673d9ab5267ff9cfc85f22c38fed5c5e0916df5 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 16 Oct 2018 20:03:05 -0700
Subject: curl: Probe for size of size_t, time_t and long

There are still several more SIZEOF_* constants in curl_config.h,
but they seem to match for architectures we care about.
---
 pkg/awk/src            |  2 +-
 pkg/curl/curl_config.h |  6 +++---
 pkg/curl/gen.lua       | 10 +++++++++-
 pkg/e2fsprogs/src      |  2 +-
 pkg/iproute2/src       |  2 +-
 pkg/pigz/src           |  2 +-
 pkg/plan9port/src      |  2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/awk/src b/pkg/awk/src
index 1d9d8641..ba9e08cf 160000
--- a/pkg/awk/src
+++ b/pkg/awk/src
@@ -1 +1 @@
-Subproject commit 1d9d86418a8e77a0270b5cff4ba97c9c4106b750
+Subproject commit ba9e08cf8e6bc208c61c7e78a53cb671350fdba8
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
index f0df3106..cf75e62f 100644
--- a/pkg/curl/curl_config.h
+++ b/pkg/curl/curl_config.h
@@ -295,12 +295,12 @@
 #define SEND_TYPE_RETV ssize_t
 #define SIZEOF_CURL_OFF_T 8
 #define SIZEOF_INT 4
-#define SIZEOF_LONG 8
+/* probe SIZEOF_LONG */
 /* #undef SIZEOF_LONG_LONG */
 #define SIZEOF_OFF_T 8
 #define SIZEOF_SHORT 2
-#define SIZEOF_SIZE_T 8
-#define SIZEOF_TIME_T 8
+/* probe SIZEOF_SIZE_T */
+/* probe SIZEOF_TIME_T */
 #define STDC_HEADERS 1
 #define STRERROR_R_TYPE_ARG3 size_t
 #define TIME_WITH_SYS_TIME 1
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
index 2ecd45d6..9fa4dacb 100644
--- a/pkg/curl/gen.lua
+++ b/pkg/curl/gen.lua
@@ -2,7 +2,7 @@ cflags{
 	'-D HAVE_CONFIG_H',
 	'-D BUILDING_LIBCURL',
 	'-D CURL_STATICLIB',
-	'-I $dir',
+	'-I $outdir',
 	'-I $outdir/include/curl',
 	'-I $outdir/include',
 	'-I $srcdir/lib',
@@ -11,6 +11,13 @@ cflags{
 	'-I $builddir/pkg/zlib/include',
 }
 
+build('cat', '$outdir/curl_config.h', {
+	'$dir/curl_config.h',
+	'$builddir/probe/SIZEOF_LONG',
+	'$builddir/probe/SIZEOF_SIZE_T',
+	'$builddir/probe/SIZEOF_TIME_T',
+})
+
 pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
 		'curl.h',
 		'curlver.h',
@@ -22,6 +29,7 @@ pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
 		'system.h',
 })
 pkg.deps = {
+	'$outdir/curl_config.h',
 	'$dir/headers',
 	'pkg/libressl/headers',
 	'pkg/zlib/headers',
diff --git a/pkg/e2fsprogs/src b/pkg/e2fsprogs/src
index 40e66e2e..e36c60bc 160000
--- a/pkg/e2fsprogs/src
+++ b/pkg/e2fsprogs/src
@@ -1 +1 @@
-Subproject commit 40e66e2e8be046f909dfff73b3909f15c9d0f400
+Subproject commit e36c60bc01c2d0ab9b6034953f7a4e016ea81232
diff --git a/pkg/iproute2/src b/pkg/iproute2/src
index 31ad498a..bfc5bd36 160000
--- a/pkg/iproute2/src
+++ b/pkg/iproute2/src
@@ -1 +1 @@
-Subproject commit 31ad498a01c929755dc16a5761b011aa37d14d6f
+Subproject commit bfc5bd369c76ffa97043d0fe3ee0c3d8e77b0df6
diff --git a/pkg/pigz/src b/pkg/pigz/src
index fe822cb4..2519d539 160000
--- a/pkg/pigz/src
+++ b/pkg/pigz/src
@@ -1 +1 @@
-Subproject commit fe822cb435622c43f491013da77b127e9fe851a9
+Subproject commit 2519d539688300dbc898ac002a1c000ced28ab0c
diff --git a/pkg/plan9port/src b/pkg/plan9port/src
index 35d43924..bcd53ab8 160000
--- a/pkg/plan9port/src
+++ b/pkg/plan9port/src
@@ -1 +1 @@
-Subproject commit 35d43924484b88b9816e40d2f6bff4547f3eec47
+Subproject commit bcd53ab8bbf7890dfb7c5d27d038e63bcc4c8b86
-- 
cgit v1.2.3