blob: 0261f58c9098ebbfb5dbf3a30cdde8cb61fdb115 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001Taken from portage
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
7From: Gilles Dartiguelongue <eva@gentoo.org>
8Date: Tue, 6 Apr 2010 15:22:25 +0200
9Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
10
11---
12 Makefile.am | 11 ++---------
13 art_config.h | 5 +++++
14 configure.in | 10 ----------
15 3 files changed, 7 insertions(+), 19 deletions(-)
16 create mode 100644 art_config.h
17
18diff --git a/Makefile.am b/Makefile.am
19index 95952da..6aa2fe3 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
23
24 bin_SCRIPTS = \
25 libart2-config
26-
27-noinst_SCRIPTS = gen_art_config.sh
28-
29-BUILT_SOURCES = art_config.h
30-
31-art_config.h:
32- ./gen_art_config.sh > art_config.h
33
34 EXTRA_DIST = \
35 libart.def \
36@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
37
38 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
39
40-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
41-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
42+CLEANFILES = $(bin_SCRIPTS)
43+DISTCLEANFILES = $(bin_SCRIPTS)
44diff --git a/art_config.h b/art_config.h
45new file mode 100644
46index 0000000..5985f1f
47--- a/art_config.h
48+++ b/art_config.h
49@@ -0,0 +1,5 @@
50+#include <stdint.h>
51+
52+typedef uint8_t art_u8;
53+typedef uint16_t art_u16;
54+typedef uint32_t art_u32;
55diff --git a/configure.in b/configure.in
56index e4804f7..ddcac4f 100644
57--- a/configure.in
58+++ b/configure.in
59@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
60
61 AC_C_BIGENDIAN
62
63-AC_CHECK_SIZEOF(char)
64-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
65-AC_CHECK_SIZEOF(short)
66-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
67-AC_CHECK_SIZEOF(int)
68-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
69-AC_CHECK_SIZEOF(long)
70-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
71-
72 AC_CONFIG_FILES([
73 libart-features.h
74 Makefile
75@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
76 libart-zip])
77
78 AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
79-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
80
81 AC_OUTPUT
82--
831.7.0.4
84