mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From: Helmut Grohne <helmut@subdivi.de>
|
|
Subject: fix @HAVE_STDINT_H@ once stdint.h moves to /usr/include/<triplet>
|
|
https://sources.debian.org/patches/libunistring/0.9.10-1/0700-multiarch-libc.patch/
|
|
--- lib/Makefile.am.orig 2025-09-27 09:30:21.000000000 -0500
|
|
+++ lib/Makefile.am 2025-10-03 15:29:20.000000000 -0500
|
|
@@ -76,30 +76,15 @@
|
|
echo '#if __GLIBC__ >= 2'; \
|
|
echo '#include <stdint.h>'; \
|
|
echo '#else'; \
|
|
- if test -f /usr/include/stdint.h; then \
|
|
- HAVE_STDINT_H='1'; \
|
|
- else \
|
|
- HAVE_STDINT_H='defined __MINGW32__ || defined __HAIKU__ || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && !defined __NetBSD__)'; \
|
|
- fi; \
|
|
- if test -f /usr/include/inttypes.h; then \
|
|
- HAVE_INTTYPES_H='1'; \
|
|
- else \
|
|
- HAVE_INTTYPES_H='defined __MINGW32__ || defined __HAIKU__'; \
|
|
- fi; \
|
|
- if test -f /usr/include/sys/inttypes.h; then \
|
|
- HAVE_SYS_INTTYPES_H='1'; \
|
|
- else \
|
|
- HAVE_SYS_INTTYPES_H='0'; \
|
|
- fi; \
|
|
sed_escape_ampersands='s/&/\\&/g'; \
|
|
HAVE_STDINT_H=`echo "$$HAVE_STDINT_H" | sed -e "$$sed_escape_ampersands"`; \
|
|
- sed -e 's/@''HAVE_STDINT_H''@/'"$$HAVE_STDINT_H"'/g' \
|
|
+ sed -e 's/@''HAVE_STDINT_H''@/$(or @HAVE_STDINT_H@,0)/g' \
|
|
-e 's|@''INCLUDE_NEXT''@|include|g' \
|
|
-e 's|@''PRAGMA_SYSTEM_HEADER''@||g' \
|
|
-e 's|@''NEXT_STDINT_H''@|<stdint.h>|g' \
|
|
-e 's/@''HAVE_SYS_TYPES_H''@/1/g' \
|
|
- -e 's/@''HAVE_INTTYPES_H''@/'"$$HAVE_INTTYPES_H"'/g' \
|
|
- -e 's/@''HAVE_SYS_INTTYPES_H''@/'"$$HAVE_SYS_INTTYPES_H"'/g' \
|
|
+ -e 's/@''HAVE_INTTYPES_H''@/$(or @HAVE_INTTYPES_H@,0)/g' \
|
|
+ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(or @HAVE_SYS_INTTYPES_H@,0)/g' \
|
|
-e 's/@''HAVE_SYS_BITYPES_H''@/0/g' \
|
|
< $(srcdir)/stdint.mini.h; \
|
|
echo '#endif'; \
|
|
--- configure.ac.orig 2025-06-10 14:13:08.000000000 -0500
|
|
+++ configure.ac 2025-10-03 15:29:20.000000000 -0500
|
|
@@ -146,6 +146,8 @@
|
|
HEXVERSION=0x`$AWK 'BEGIN { printf("%02X%02X%02X"',"$version_major","$version_minor","$version_subminor"') }'`
|
|
AC_SUBST([HEXVERSION])
|
|
|
|
+AC_CHECK_HEADERS_ONCE(stdint.h inttypes.h sys/inttypes.h)
|
|
+
|
|
dnl Check for tools needed for formatting the documentation.
|
|
ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
|
|
AC_PATH_PROG([TEXI2DVI], [texi2dvi], [$ac_aux_dir_abs/missing texi2dvi])
|