Skip to content

Commit c82cf5a

Browse files
committed
Patch libuuid configure to include definitions needed for stable get_node_id
1 parent 50e3f68 commit c82cf5a

File tree

1 file changed

+118
-0
lines changed

1 file changed

+118
-0
lines changed

cpython-unix/build-uuid.sh

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,124 @@ export PATH=${TOOLS_PATH}/${TOOLCHAIN}/bin:${TOOLS_PATH}/host/bin:$PATH
1212
tar -xf libuuid-${UUID_VERSION}.tar.gz
1313
pushd libuuid-${UUID_VERSION}
1414

15+
patch -p1 << "EOF"
16+
diff --git a/config.h.in b/config.h.in
17+
index 8eb0959..616f74a 100644
18+
--- a/config.h.in
19+
+++ b/config.h.in
20+
@@ -31,6 +31,15 @@
21+
/* Define to 1 if you have the <netinet/in.h> header file. */
22+
#undef HAVE_NETINET_IN_H
23+
24+
+/* Define to 1 if you have the <net/if_dl.h> header file. */
25+
+#undef HAVE_NET_IF_DL_H
26+
+
27+
+/* Define to 1 if you have the <net/if.h> header file. */
28+
+#undef HAVE_NET_IF_H
29+
+
30+
+/* Define if struct sockaddr contains sa_len */
31+
+#undef HAVE_SA_LEN
32+
+
33+
/* Define to 1 if you have the `socket' function. */
34+
#undef HAVE_SOCKET
35+
36+
diff --git a/configure b/configure
37+
index f73a9ea..9f6a04c 100755
38+
--- a/configure
39+
+++ b/configure
40+
@@ -2083,6 +2095,63 @@ $as_echo "$ac_res" >&6; }
41+
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
42+
43+
} # ac_fn_c_find_uintX_t
44+
+
45+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
46+
+# ----------------------------------------------------
47+
+# Tries to find if the field MEMBER exists in type AGGR, after including
48+
+# INCLUDES, setting cache variable VAR accordingly.
49+
+ac_fn_c_check_member ()
50+
+{
51+
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
52+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
53+
+$as_echo_n "checking for $2.$3... " >&6; }
54+
+if eval \${$4+:} false; then :
55+
+ $as_echo_n "(cached) " >&6
56+
+else
57+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
58+
+/* end confdefs.h. */
59+
+$5
60+
+int
61+
+main ()
62+
+{
63+
+static $2 ac_aggr;
64+
+if (ac_aggr.$3)
65+
+return 0;
66+
+ ;
67+
+ return 0;
68+
+}
69+
+_ACEOF
70+
+if ac_fn_c_try_compile "$LINENO"; then :
71+
+ eval "$4=yes"
72+
+else
73+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
74+
+/* end confdefs.h. */
75+
+$5
76+
+int
77+
+main ()
78+
+{
79+
+static $2 ac_aggr;
80+
+if (sizeof ac_aggr.$3)
81+
+return 0;
82+
+ ;
83+
+ return 0;
84+
+}
85+
+_ACEOF
86+
+if ac_fn_c_try_compile "$LINENO"; then :
87+
+ eval "$4=yes"
88+
+else
89+
+ eval "$4=no"
90+
+fi
91+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
92+
+fi
93+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
94+
+fi
95+
+eval ac_res=\$$4q
96+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
97+
+$as_echo "$ac_res" >&6; }
98+
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
99+
+
100+
+} # ac_fn_c_check_member
101+
cat >config.log <<_ACEOF
102+
This file contains any messages produced by compilers while
103+
running configure, to aid debugging if configure makes a mistake.
104+
@@ -12306,7 +12375,7 @@ fi
105+
106+
107+
# Checks for header files.
108+
-for ac_header in fcntl.h inttypes.h limits.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h
109+
+for ac_header in fcntl.h inttypes.h limits.h net/if.h netinet/in.h net/if_dl.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h
110+
do :
111+
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
112+
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
113+
@@ -12445,6 +12514,17 @@ fi
114+
done
115+
116+
117+
+
118+
+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
119+
+ #include <sys/socket.h>
120+
+"
121+
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
122+
+
123+
+$as_echo "#define HAVE_SA_LEN 1" >>confdefs.h
124+
+
125+
+fi
126+
+
127+
+
128+
PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}')
129+
PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}')
130+
PACKAGE_VERSION_RELEASE=$(echo $PACKAGE_VERSION | awk -F. '{print $3}')
131+
EOF
132+
15133
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC"
16134

17135
# Error by default in Clang 16.

0 commit comments

Comments
 (0)