oasis

commit: 314c8b36a2ec5e43d2d516b9c09a6129f31b260c
parent 8ee61f4961648834b435ed50c99f64c33297d5c5
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 16 Oct 2018 20:19:15 -0700

e2fsprogs: Probe for size of long and time_t

Diffstat:
M
pkg/e2fsprogs/config.h
4
++--
M
pkg/e2fsprogs/gen.lua
9
++++++++-

2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/pkg/e2fsprogs/config.h b/pkg/e2fsprogs/config.h
@@ -215,11 +215,11 @@
 /* #undef PRI_MACROS_BROKEN */
 /* #undef PTHREAD_IN_USE_DETECTION_HARD */
 #define SIZEOF_INT 4
-#define SIZEOF_LONG 8
+/* probe SIZEOF_LONG */
 #define SIZEOF_LONG_LONG 8
 #define SIZEOF_OFF_T 8
 #define SIZEOF_SHORT 2
-#define SIZEOF_TIME_T 8
+/* probe SIZEOF_TIME_T */
 #ifndef SIZE_MAX
 /* # undef SIZE_MAX */
 #endif
diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
@@ -1,7 +1,7 @@
 set('version', '1.44.4')
 cflags{
 	'-D HAVE_CONFIG_H',
-	'-I $dir',
+	'-I $outdir',
 	'-I $outdir/include',
 	'-I $outdir/internal',
 	'-I $outdir/internal/support',
@@ -9,6 +9,12 @@ cflags{
 	'-I $builddir/pkg/util-linux/include',
 }
 
+build('cat', '$outdir/config.h', {
+	'$dir/config.h',
+	'$builddir/probe/SIZEOF_LONG',
+	'$builddir/probe/SIZEOF_TIME_T',
+})
+
 set('subst', {
 	'-e s,@E2FSPROGS_VERSION@,$version,',
 	'-e s,@E2FSPROGS_MONTH@,Aug,',
@@ -63,6 +69,7 @@ pkg.hdrs = {
 	'$outdir/include/ext2fs/ext2_types.h',
 }
 pkg.deps = {
+	'$outdir/config.h',
 	'$dir/headers',
 	'$outdir/internal/blkid/blkid_types.h',
 	'$outdir/internal/support/prof_err.h',