commit: 9b439c278d2b340e34b27134ac5b9dd01b89314f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 31 14:25:07 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 31 14:25:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b439c27
dev-libs/dmalloc: drop 5.5.2-r7, 5.6.5-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/dmalloc/Manifest | 1 - dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild | 88 ------ dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild | 62 ---- .../dmalloc/files/dmalloc-5.5.2-Makefile.in.patch | 343 --------------------- dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch | 11 - dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch | 19 -- .../files/dmalloc-5.5.2-string-macros.patch | 18 -- dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch | 11 - 8 files changed, 553 deletions(-) diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest index 9f669702ee43..d7b96d4c9ca3 100644 --- a/dev-libs/dmalloc/Manifest +++ b/dev-libs/dmalloc/Manifest @@ -1,2 +1 @@ -DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93 DIST dmalloc-5.6.5.tgz 322310 BLAKE2B 43ba8cdef73423f2e3d6fa5dea34f1653d890c95dcd4ea13e9317d85d1991d0e68e80192860c7bdaf4ee33b36c892b9df31340ddde808b7d60ee00f21d532976 SHA512 17090378b763dd3eaf5ff196298f08982ad593d4c3a0104a67866b88793b612307f3ce9ef0aa7dfef2df6c8eb050e2be06513b29ca912e916c0bfd882a0f4bf1 diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild deleted file mode 100644 index a9ffdad2cd2b..000000000000 --- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="A Debug Malloc Library" -HOMEPAGE="https://dmalloc.com"; -SRC_URI="https://dmalloc.com/releases/${P}.tgz"; - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="threads" - -BDEPEND="sys-apps/texinfo" - -DOCS=( NEWS README docs/NOTES docs/TODO ) - -PATCHES=( - # - Build objects twice, once -fPIC for shared. - # - Use DESTDIR. - # - Fix SONAME and NEEDED. - "${FILESDIR}"/${P}-Makefile.in.patch - # - Broken test, always returns false. - "${FILESDIR}"/${P}-cxx.patch - "${FILESDIR}"/${P}-ar.patch - # strdup() strndup() macros - "${FILESDIR}"/${P}-string-macros.patch -) - -src_prepare() { - default - - # - Add threads support. - use threads && eapply "${FILESDIR}"/${P}-threads.patch - - # Respect CFLAGS/LDFLAGS. #337429 - sed -i \ - -e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \ - -e 's|ar cr|$(AR) cr|g' \ - Makefile.in || die - - # Run autoconf for -cxx.patch. - eautoconf -} - -src_configure() { - tc-export AR - - econf \ - --enable-cxx \ - --enable-shlib \ - $(use_enable threads) -} - -src_compile() { - default - - cd docs - makeinfo dmalloc.texi || die -} - -src_test() { - emake heavy -} - -src_install() { - default - - newdoc ChangeLog.1 ChangeLog - dodoc docs/dmalloc.pdf - dodoc RELEASE.html docs/dmalloc.html - doinfo docs/dmalloc.info - - # add missing symlinks, lazy - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*} - - for lib in cxx th thcxx; do - dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so - dosym lib${PN}${lib}.so.${PV} \ - /usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*} - done - - rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die -} diff --git a/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild b/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild deleted file mode 100644 index ee3f5afb3a2d..000000000000 --- a/dev-libs/dmalloc/dmalloc-5.6.5-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A Debug Malloc Library" -HOMEPAGE="https://dmalloc.com"; -SRC_URI="https://dmalloc.com/releases/${P}.tgz"; - -LICENSE="CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="threads" - -BDEPEND="sys-apps/texinfo" - -PATCHES=( - "${FILESDIR}"/${PN}-5.6.5-add-destdir-support.patch - "${FILESDIR}"/${PN}-5.6.5-allow-overriding-ar-and-ld.patch - "${FILESDIR}"/${PN}-5.6.5-set-soname-version.patch - "${FILESDIR}"/${PN}-5.6.5-configure-c99.patch - "${FILESDIR}"/${PN}-5.6.5-fix-cxx-check.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - --enable-cxx \ - --enable-shlib \ - $(use_enable threads) -} - -src_test() { - # mv: cannot stat 'aout': No such file or directory - emake -j1 heavy -} - -src_install() { - default - - soname_link() { - dosym ${1}.so.${PV} /usr/$(get_libdir)/${1}.so.${PV%%.*} - dosym ${1}.so.${PV%%.*} /usr/$(get_libdir)/${1}.so - } - - soname_link libdmalloc - soname_link libdmallocxx - - if use threads; then - soname_link libdmallocth - soname_link libdmallocthcxx - fi - - rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die -} diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch deleted file mode 100644 index 92b232eb58e9..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch +++ /dev/null @@ -1,343 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - - # thread version of the library - LIB_TH = lib$(MODULE)th.a --LIB_TH_SL = lib$(MODULE)th.@shlibext@ -+LIB_TH_SL = lib$(MODULE)th.@[email protected] - @TH_ON@BUILD_ALL_1 = threads - @TH_ON@INSTALL_LIB_1 = installth - @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) -@@ -50,8 +50,8 @@ - @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl - - # C++ version of the library --LIB_CXX = lib$(MODULE)xx.a --LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ -+LIB_CXX = lib$(MODULE)cxx.a -+LIB_CXX_SL = lib$(MODULE)cxx.@[email protected] - @CXX_ON@BUILD_ALL_3 = $(LIB_CXX) - @CXX_ON@INSTALL_LIB_3 = installcxx - @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) -@@ -61,7 +61,7 @@ - - # threads + C++ - LIB_TH_CXX = lib$(MODULE)thcxx.a --LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ -+LIB_TH_CXX_SL = lib$(MODULE)thcxx.@[email protected] - @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) - @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx - @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) -@@ -76,7 +76,7 @@ - @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl - - # shared versions of the libraries --LIB_SL = lib$(MODULE).@shlibext@ -+LIB_SL = lib$(MODULE).@[email protected] - @SL_ON@BUILD_ALL_7 = $(LIB_SL) - @SL_ON@INSTALL_LIB_7 = installsl - @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) -@@ -145,9 +145,13 @@ - - HFLS = dmalloc.h - OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o -+OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o - NORMAL_OBJS = chunk.o error.o malloc.o -+NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o - THREAD_OBJS = chunk_th.o error_th.o malloc_th.o -+THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o - CXX_OBJS = dmallocc.o -+CXX_OBJS_SL = dmallocc_sl.o - - CFLAGS = $(CCFLAGS) - TEST = $(MODULE)_t -@@ -160,9 +164,9 @@ - - clean : - rm -f $(A_OUT) core *.o *.t -- rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC) -- rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL) -+ rm -f $(TEST) $(TEST_FC) - rm -f $(UTIL) dmalloc.h -+ rm -f lib$(MODULE)*.* - - realclean : clean - -@@ -174,65 +178,65 @@ - # rm -f configure - - 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)$(shlibdir) -+ $(INSTALL) $(LIB_TH_SL) $(DESTDIR)$(shlibdir) - - installth : $(INSTALL_THREADS) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(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) $(LIB_TH_CXX_SL) $(DESTDIR)$(libdir) - - installthcxx : $(INSTALL_TH_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(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)$(shlibdir) -+ $(INSTALL) $(LIB_CXX_SL) $(DESTDIR)$(shlibdir) - - installcxx : $(INSTALL_CXX) -- $(srcdir)/mkinstalldirs $(libdir) -- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) -+ $(INSTALL) $(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) $(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) $(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" - - installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ - $(srcdir)/docs/$(PDFFILE) -- $(srcdir)/mkinstalldirs $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) -- $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(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 $(DOCFILES) in $(docdir)" - - dmalloc.h.2 : $(srcdir)/configure -@@ -255,10 +259,8 @@ - # NOTE: you may have to edit the configure.ac script to get this to - # work on your operating system. Please send feedback to the author - # via: http://256.com/gray/email.html --$(LIB_SL) : $(LIBRARY) -- rm -f $@ [email protected] -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -- mv [email protected] $@ -+$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) - ar cr $@ $? -@@ -268,32 +270,26 @@ - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_TH_SL) : $(LIB_TH) -- rm -f $@ [email protected] -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -- mv [email protected] $@ -+$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_CXX_SL) : $(LIB_CXX) -- rm -f $@ [email protected] -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -- mv [email protected] $@ -+$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) - ar cr $@ $? - @RANLIB@ $@ - --$(LIB_TH_CXX_SL) : $(LIB_TH_CXX) -- rm -f $@ [email protected] -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -- mv [email protected] $@ -+$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) -+ $(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) - --threadssl : $(LIB_TH_SL) -+threadssl : $(LIB_TH_SL)$(ver) - --threadscxxsl : $(LIB_TH_CXX_SL) -+threadscxxsl : $(LIB_TH_CXX_SL)$(ver) - - threadscxx : $(BUILD_TH_CXX) - @SL_OFF@ @echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library" -@@ -302,7 +298,7 @@ - @CXX_OFF@ @echo "Enter 'make threadscxx' to build the threaded C++ library" - @SL_OFF@ @echo "Enter 'make threadssl' to build the threaded shared library" - --cxxsl : $(LIB_CXX_SL) -+cxxsl : $(LIB_CXX_SL)$(ver) - - cxx : $(BUILD_CXX) - @SL_OFF@ @echo "Enter 'make cxxsl' to build the cxx shared library" -@@ -371,6 +367,11 @@ - $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ - -o ./$@ - -+dmallocc_sl.o : $(srcdir)/dmallocc.cc -+ rm -f $@ -+ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ -+ -o ./$@ -+ - # - # auto configure settings - uncomment if you are doing configure - # development on the library -@@ -395,38 +396,109 @@ - - arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ - dmalloc_loc.h error.h arg_check.h -+arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ -+ dmalloc_loc.h error.h arg_check.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ - dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ - error_val.h heap.h -+chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ -+ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h -+compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ - dmalloc_argv_loc.h compat.h -+dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ -+ dmalloc_argv_loc.h compat.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ - dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h -+dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ -+ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h -+dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ - dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ - error_val.h heap.h -+dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ -+ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ - dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h -+dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ -+ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ - debug_tok.h env.h error.h -+env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ -+ debug_tok.h env.h error.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h env.h error.h error_val.h version.h -+error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h env.h error.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h error.h error_val.h heap.h -+heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h error.h error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ - malloc_funcs.h return.h -+malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ -+ malloc_funcs.h return.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ - heap.h protect.h -+protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ -+ heap.h protect.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ - dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ - error_val.h heap.h -+chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ -+ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ -+ error_val.h heap.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ - dmalloc_loc.h env.h error.h error_val.h version.h -+error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ -+ dmalloc_loc.h env.h error.h error_val.h version.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ - malloc_funcs.h return.h -+malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ -+ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ -+ malloc_funcs.h return.h -+ rm -f $@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch deleted file mode 100644 index 56be2fa3ef4e..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -131,7 +132,7 @@ - AC_MSG_CHECKING([shared library link args]) - AC_COMPILE_IFELSE([ 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 diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch deleted file mode 100644 index 0fa01e105c53..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -55,11 +55,12 @@ - AC_PROG_CC - AC_PROG_CXX - -+# fixme. always returns false. - # 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) -- enable_cxx=no --fi -+#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) -+# enable_cxx=no -+#fi - - # hopefully we have a stdc c-compiler - if test "$ac_cv_prog_cc_stdc" = "no" ; then diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch deleted file mode 100644 index e3d4eb78fe52..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-string-macros.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/dmalloc.h.3 -+++ b/dmalloc.h.3 -@@ -405,6 +405,7 @@ - * - * string -> String we are duplicating. - */ -+#undef strdup - extern - char *strdup(const char *string); - #endif /* ifndef DMALLOC_STRDUP_MACRO */ -@@ -429,6 +430,7 @@ - * - * len -> Length of the string to duplicate. - */ -+#undef strndup - extern - char *strndup(const char *string, const DMALLOC_SIZE len); - diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch deleted file mode 100644 index c3cbd90aa9f5..000000000000 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/settings.dist -+++ b/settings.dist -@@ -409,7 +409,7 @@ - */ - - #ifndef LOCK_THREADS --#define LOCK_THREADS 0 -+#define LOCK_THREADS 1 - #endif - - #if LOCK_THREADS
