diff options
Diffstat (limited to 'dev-cpp/libmcpp/files')
4 files changed, 149 insertions, 0 deletions
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch new file mode 100644 index 000000000000..95cefadd3fe8 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-build-system.patch @@ -0,0 +1,30 @@ +Specify and install files using idiomatic Automake +conventions instead of manually installing with cp. + +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,16 +23,12 @@ + $(top_srcdir)/test-c $(top_srcdir)/test-l $(top_srcdir)/tool \ + $(top_srcdir)/doc $(top_srcdir)/doc-jp + +-if ! REPLACE_CPP +-install-exec-hook: +- $(top_srcdir)/config/install-sh -d "$(DESTDIR)$(prefix)/share/doc/mcpp" +- cp -pf $(top_srcdir)/LICENSE $(top_srcdir)/README $(top_srcdir)/NEWS \ +- $(DESTDIR)$(prefix)/share/doc/mcpp +- cp -pf $(top_srcdir)/doc/mcpp-manual.html \ +- $(DESTDIR)$(prefix)/share/doc/mcpp +- cp -pf $(top_srcdir)/doc-jp/mcpp-manual.html \ +- $(DESTDIR)$(prefix)/share/doc/mcpp/mcpp-manual-jp.html +-uninstall-hook: +- rm -rf $(DESTDIR)$(prefix)/share/doc/mcpp +-endif ++dist_doc_DATA = README NEWS doc/mcpp-summary.pdf + ++dist_html_DATA = \ ++ doc/cpp-test.html \ ++ doc/mcpp-manual.html \ ++ doc/mcpp-porting.html ++ ++htmljadir = $(htmldir)/doc-jp ++dist_htmlja_DATA = doc-jp/mcpp-manual.html diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch new file mode 100644 index 000000000000..e7bb77d6cf41 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch @@ -0,0 +1,34 @@ +https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch?id=6721430ca97aa98208cc1c450e4e8c4c274ca840 + +From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Sep 2022 00:02:08 -0700 +Subject: [PATCH] configure: Fix checks for system headers + +Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/configure.ac ++++ b/configure.ac +@@ -152,7 +152,7 @@ fi + + dnl Checks for header files. + +-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h]) ++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h]) + + dnl Checks for typedefs, and compiler characteristics. + +--- a/src/system.c ++++ b/src/system.c +@@ -36,6 +36,8 @@ + * 1. specify the constants in "configed.H" or "noconfig.H", + * 2. append the system-dependent routines in this file. + */ ++ ++#define _DEFAULT_SOURCE + #if PREPROCESSED + #include "mcpp.H" + #else diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch new file mode 100644 index 000000000000..fc84009d4366 --- /dev/null +++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-incompatible-pointer-types.patch @@ -0,0 +1,26 @@ +https://github.com/jbrandwood/mcpp/commit/3b274fe8f31d61996343b17402f30408a6e447cf + +From 3b274fe8f31d61996343b17402f30408a6e447cf Mon Sep 17 00:00:00 2001 +From: John Brandwood <john.brandwood@telzey.com> +Date: Fri, 15 Mar 2024 15:15:53 -0400 +Subject: [PATCH] Fix build with GCC 14.x by splitting a NULL assignment into 2 + lines. + +--- + src/expand.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/expand.c b/src/expand.c +index 08f829a..ea2d2a9 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -710,7 +710,8 @@ static char * replace( + } else { + m_inf->locs.start_col = m_inf->locs.start_line = 0L; + } +- m_inf->args = m_inf->loc_args = NULL; /* Default args */ ++ m_inf->args = NULL; /* Default args */ ++ m_inf->loc_args = NULL; + for (num = 1, recurs = 0; num < m_num; num++) + if (mac_inf[ num].defp == defp) + recurs++; /* Recursively nested macro */ diff --git a/dev-cpp/libmcpp/files/mcpp-c99.patch b/dev-cpp/libmcpp/files/mcpp-c99.patch new file mode 100644 index 000000000000..e6538e7955f4 --- /dev/null +++ b/dev-cpp/libmcpp/files/mcpp-c99.patch @@ -0,0 +1,59 @@ +Florian Weimer's c99 patch from https://sourceforge.net/p/mcpp/patches/7/ + +Do not define and undefine _*_SOURCE macros. These have special +semantics to glibc. <limits.h> may include <features.h>, and which +point the feature configuration gets frozen. Without this change, +when system.c includes <unistd.h>, the feature macros are hard-coded +as baseline POSIX, which does not include readlink. This will lead to +compilation errors with future compilers. + +diff --git a/src/configed.H b/src/configed.H +index b4d1ebf3a6bfa280..bde16fc8db38a2c4 100644 +--- a/src/configed.H ++++ b/src/configed.H +@@ -295,20 +295,7 @@ + * ULONGMAX should be defined to the ULONG_MAX in <limits.h>. + */ + +-/* _POSIX_* only to get PATH_MAX */ +-#define _POSIX_ 1 +-#define _POSIX_SOURCE 1 +-#ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 +-#define _POSIX_C_SOURCE_defined 1 +-#endif + #include "limits.h" +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #define CHARBIT CHAR_BIT + #define UCHARMAX UCHAR_MAX + #define USHRTMAX USHRT_MAX +diff --git a/src/noconfig.H b/src/noconfig.H +index 6b634fe0b32ff67c..7c923c900c8865dd 100644 +--- a/src/noconfig.H ++++ b/src/noconfig.H +@@ -570,20 +570,7 @@ + #include "stdio.h" + + /* PATHMAX is the maximum length of path-list on the host system. */ +-/* _POSIX_* only to get PATH_MAX */ +-#define _POSIX_ 1 +-#define _POSIX_SOURCE 1 +-#ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 +-#define _POSIX_C_SOURCE_defined 1 +-#endif + #include "limits.h" +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #ifdef PATH_MAX + #define PATHMAX PATH_MAX /* Posix macro */ + #else |