diff options
Diffstat (limited to 'dev-libs/dmalloc/files')
5 files changed, 0 insertions, 314 deletions
diff --git a/dev-libs/dmalloc/files/dmalloc-5.6.5-add-destdir-support.patch b/dev-libs/dmalloc/files/dmalloc-5.6.5-add-destdir-support.patch deleted file mode 100644 index 2ab42e0d258c..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.6.5-add-destdir-support.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 79c791659a519cc7b3b3e615a3cc51c5e85a0a0a Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sat, 16 Dec 2023 14:13:57 +0200 -Subject: [PATCH 1/5] Add DESTDIR support - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/Makefile.in -+++ b/Makefile.in -@@ -182,65 +182,65 @@ distclean : clean - docs : $(DOCS) LICENSE.txt - - installdirs : -- $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) - - installincs : $(HFLS) -- $(srcdir)/mkinstalldirs $(includedir) -- $(INSTALL_DATA) $(HFLS) $(includedir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) -+ $(INSTALL_DATA) $(HFLS) $(DESTDIR)$(includedir) - - installthsl : $(LIB_TH_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_SL) $(DESTDIR)$(libdir) - - installth : $(INSTALL_THREADS) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH) $(DESTDIR)$(libdir) - @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" - - installthcxxsl : $(LIB_TH_CXX_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(DESTDIR)$(shlibdir) - - installthcxx : $(INSTALL_TH_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(DESTDIR)$(libdir) - @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" - - installcxxsl : $(LIB_CXX_SL) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(DESTDIR)$(libdir) - - installcxx : $(INSTALL_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIB_CXX) $(DESTDIR)$(libdir) - @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" - @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - - installsl : $(LIB_SL) -- $(srcdir)/mkinstalldirs $(shlibdir) -- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) -+ $(INSTALL_PROGRAM) $(LIB_SL) $(DESTDIR)$(shlibdir) - @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" - @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" - - installlib : $(INSTALL_LIB) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) -- @RANLIB@ $(libdir)/$(LIBRARY) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(LIBRARY) $(DESTDIR)$(libdir) -+ @RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY) - @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" - @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" - @TH_OFF@ @echo "Enter 'make installth' to install thread library" - - # see notes about why we need the FILE2 entries below - installdocs : $(INSTALL_FILE2) $(HTML_FILE2) $(INFO_FILE) -- $(srcdir)/mkinstalldirs $(docdir) -- $(INSTALL_DATA) $(INSTALL_FILE2) $(docdir)/$(INSTALL_FILE) -- $(INSTALL_DATA) $(HTML_FILE2) $(docdir)/$(HTML_FILE) -- $(INSTALL_DATA) $(INFO_FILE) $(docdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(INSTALL_FILE2) $(DESTDIR)$(docdir)/$(INSTALL_FILE) -+ $(INSTALL_DATA) $(HTML_FILE2) $(DESTDIR)$(docdir)/$(HTML_FILE) -+ $(INSTALL_DATA) $(INFO_FILE) $(DESTDIR)$(docdir) - - install : installincs installlib $(UTIL) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) $(UTIL) $(bindir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir) - @echo "Enter 'make installdocs' to install $(DOCS) in $(docdir)" - - dmalloc.h.2 conf.h settings.h version.h : $(srcdir)/configure $(srcdir)/settings.dist $(srcdir)/conf.h.in --- -2.43.0 - diff --git a/dev-libs/dmalloc/files/dmalloc-5.6.5-allow-overriding-ar-and-ld.patch b/dev-libs/dmalloc/files/dmalloc-5.6.5-allow-overriding-ar-and-ld.patch deleted file mode 100644 index 981909d9940a..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.6.5-allow-overriding-ar-and-ld.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 626e5fb4c3f89b21e5ed75ee6c01d86527dede5f Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 17 Dec 2023 13:57:11 +0200 -Subject: [PATCH 2/5] Allow overriding AR and LD - -https://bugs.gentoo.org/337429 - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/Makefile.in -+++ b/Makefile.in -@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) - mv $@.t $@ - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -- ar cr $@ $? -+ $(AR) cr $@ $? - @RANLIB@ $@ - - $(LIB_TH) : $(OBJS) $(THREAD_OBJS) -- ar cr $@ $? -+ $(AR) cr $@ $? - @RANLIB@ $@ - - $(LIB_TH_SL) : $(LIB_TH) -@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) - mv $@.t $@ - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -- ar cr $@ $? -+ $(AR) cr $@ $? - @RANLIB@ $@ - - $(LIB_CXX_SL) : $(LIB_CXX) -@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) - mv $@.t $@ - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -- ar cr $@ $? -+ $(AR) cr $@ $? - @RANLIB@ $@ - - $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) ---- a/configure.ac -+++ b/configure.ac -@@ -76,8 +76,13 @@ if test "$ac_cv_prog_cc_stdc" = "no" ; then - fi - AC_PROG_INSTALL - AC_PROG_RANLIB -+AC_CHECK_TOOL(AR,ar) -+AC_CHECK_TOOL(LD,ld) - AC_C_CONST - -+AC_ARG_VAR(AR) -+AC_ARG_VAR(LD) -+ - # we need this for various settings - AC_HEADER_STDC - AC_CHECK_HEADER([stdarg.h], -@@ -144,7 +149,7 @@ AC_SUBST(shlibdir) - AC_MSG_CHECKING([shared library link args]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ - # so now we try to create an archive from the compiled .o file -- (ar cr conftest.a conftest.o) 2>&5 -+ (${AR} cr conftest.a conftest.o) 2>&5 - # see which shared-library ld commands work - # - # Darwin/Mac OS X - Terry Teague -@@ -169,12 +174,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ - ac_cv_shared_link_args='# Could not configure shlib linking' - enable_shlib=no - fi -- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' -- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' -- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then -- ac_cv_shared_link_args='ld -G -o $@.t' -+ elif (${LD} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then -+ ac_cv_shared_link_args='$(LD) -shared --whole-archive -soname $@ -o $@.t' -+ elif (${LD} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then -+ ac_cv_shared_link_args='$(LD) -shared -o $@.t -all -soname $@ -none -lc -all' -+ elif (${LD} -G -o conftest.so.t conftest.a) 2>&5; then -+ ac_cv_shared_link_args='$(LD) -G -o $@.t' - else - # oh well, toss an error - ac_cv_shared_link_args='# Could not configure shlib linking' --- -2.43.0 - diff --git a/dev-libs/dmalloc/files/dmalloc-5.6.5-configure-c99.patch b/dev-libs/dmalloc/files/dmalloc-5.6.5-configure-c99.patch deleted file mode 100644 index 4f5e6339d8aa..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.6.5-configure-c99.patch +++ /dev/null @@ -1,68 +0,0 @@ -From debb91ecdd39a7039abdc6b2fb4c9b79956fc758 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 17 Dec 2023 14:35:31 +0200 -Subject: [PATCH 4/5] Fix c99 compatibility in configure script - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -486,19 +486,20 @@ AC_MSG_RESULT([$ac_cv_pnt_arith_type]) - AC_CHECK_FUNCS(abort) - AC_MSG_CHECKING([abort safe]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include <stdlib.h> - static int main_b = 0; - static char heap_mem[102400], *heap_p = heap_mem; --free () { if (main_b) _exit(0); } -+void free () { if (main_b) exit(0); } - char *malloc (int size) { - char *pnt; -- if (main_b) _exit(0); -+ if (main_b) exit(0); - pnt = heap_p; - heap_p += size; - return pnt; - } - char *calloc (int number, int size) { - char *start, *pnt, *end; -- if (main_b) _exit(0); -+ if (main_b) exit(0); - /* it should be already 0s */ - start = malloc (number * size); - pnt = start; -@@ -508,7 +509,7 @@ char *calloc (int number, int size) { - } - char *realloc (char *old_pnt, int new_size) { - char *start, *pnt, *end; -- if (main_b) _exit(0); -+ if (main_b) exit(0); - start = malloc (new_size); - pnt = start; - end = start + new_size; -@@ -549,6 +550,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - AC_CHECK_FUNCS(getenv) - AC_MSG_CHECKING([getenv safe]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include <stdlib.h> - static char heap_mem[102400], *heap_p = heap_mem; - free (char *pnt) { - } -@@ -651,6 +653,7 @@ fi - # - AC_MSG_CHECKING([constructor attribute]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include <stdlib.h> - /* if we call the loc_con constructor then exit with error code 0 */ - static void loc_con() __attribute__((constructor)); - static void loc_con() { exit(0); } -@@ -666,6 +669,7 @@ int main() { return 1; } - # - AC_MSG_CHECKING([destructor attribute]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include <stdlib.h> - /* if we call the loc_decon destructor then exit with error code 0 */ - static void loc_decon() __attribute__((destructor)); - static void loc_decon() { exit(0); } --- -2.43.0 - diff --git a/dev-libs/dmalloc/files/dmalloc-5.6.5-fix-cxx-check.patch b/dev-libs/dmalloc/files/dmalloc-5.6.5-fix-cxx-check.patch deleted file mode 100644 index 7e7c61f1baa3..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.6.5-fix-cxx-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 17fb0cc429213fa3c2dd3d2bdec3b87e6b779be9 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 17 Dec 2023 14:49:28 +0200 -Subject: [PATCH 5/5] Fix CXX check - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -63,8 +63,8 @@ AC_PROG_CC - AC_PROG_CXX - - # see if we actually have a CXX program --if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then -- AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) -+if test "x$CXX" = "x" -o -x "$CXX"; then -+ AC_MSG_WARN(could not find C++ compiler $CXX) - enable_cxx=no - fi - --- -2.43.0 - diff --git a/dev-libs/dmalloc/files/dmalloc-5.6.5-set-soname-version.patch b/dev-libs/dmalloc/files/dmalloc-5.6.5-set-soname-version.patch deleted file mode 100644 index ebed9c0ef1aa..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.6.5-set-soname-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4cab6b74df4fb9ed7046faeb53c5ab01fa0716a1 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 17 Dec 2023 14:26:44 +0200 -Subject: [PATCH 3/5] Set soname version for shared library - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,9 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ - enable_shlib=no - fi - elif (${LD} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then -- ac_cv_shared_link_args='$(LD) -shared --whole-archive -soname $@ -o $@.t' -+ ac_cv_shared_link_args="\$(LD) -shared --whole-archive -soname \$(@:${dmalloc_version}=${dmalloc_version_major}) -o \$@.t" - elif (${LD} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then -- ac_cv_shared_link_args='$(LD) -shared -o $@.t -all -soname $@ -none -lc -all' -+ ac_cv_shared_link_args="\$(LD) -shared -o \$@.t -all -soname \$(@:${dmalloc_version}=${dmalloc_version_major}) -none -lc -all" - elif (${LD} -G -o conftest.so.t conftest.a) 2>&5; then - ac_cv_shared_link_args='$(LD) -G -o $@.t' - else -@@ -208,7 +208,7 @@ if test `uname` = "Darwin"; then - else - ac_cv_shared_lib_suffix=so - fi --shlibext="$ac_cv_shared_lib_suffix" -+shlibext="$ac_cv_shared_lib_suffix.$dmalloc_version" - AC_MSG_RESULT([$ac_cv_shared_lib_suffix]) - AC_SUBST(shlibext) - --- -2.43.0 - |