From 6317df47791e1e35b78dc69a636445dbc22d5c21 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 28 Jul 2008 21:32:33 +0000 Subject: Fourth step at renaming patches: renumber all patches with a 10-step. --- patches/dmalloc/5.5.2/130-mips.patch | 64 +++++++++++++++ patches/dmalloc/5.5.2/140-shared_library.patch | 44 +++++++++++ patches/dmalloc/5.5.2/150-use_DESTDIR.patch | 105 +++++++++++++++++++++++++ patches/dmalloc/5.5.2/160-strdup_macro.patch | 39 +++++++++ patches/dmalloc/5.5.2/200-mips.patch | 64 --------------- patches/dmalloc/5.5.2/300-shared_library.patch | 44 ----------- patches/dmalloc/5.5.2/400-use_DESTDIR.patch | 105 ------------------------- patches/dmalloc/5.5.2/500-strdup_macro.patch | 39 --------- 8 files changed, 252 insertions(+), 252 deletions(-) create mode 100644 patches/dmalloc/5.5.2/130-mips.patch create mode 100644 patches/dmalloc/5.5.2/140-shared_library.patch create mode 100644 patches/dmalloc/5.5.2/150-use_DESTDIR.patch create mode 100644 patches/dmalloc/5.5.2/160-strdup_macro.patch delete mode 100644 patches/dmalloc/5.5.2/200-mips.patch delete mode 100644 patches/dmalloc/5.5.2/300-shared_library.patch delete mode 100644 patches/dmalloc/5.5.2/400-use_DESTDIR.patch delete mode 100644 patches/dmalloc/5.5.2/500-strdup_macro.patch (limited to 'patches/dmalloc') diff --git a/patches/dmalloc/5.5.2/130-mips.patch b/patches/dmalloc/5.5.2/130-mips.patch new file mode 100644 index 00000000..69f0e450 --- /dev/null +++ b/patches/dmalloc/5.5.2/130-mips.patch @@ -0,0 +1,64 @@ +Patch to correctly handle the MIPS case. + +It was build up by Yann E. MORIN from some +bits gathered from buildroot, which is LGPL v2.1 +License for dmalloc is: + * Permission to use, copy, modify, and distribute this software for + * any purpose and without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies, and that the name of Gray Watson not be used in advertising + * or publicity pertaining to distribution of the document or software + * without specific, written prior permission. + * + * Gray Watson makes no representations about the suitability of the + * software described herein for any purpose. It is provided "as is" + * without express or implied warranty. + +I personnaly believe that the resulting code should therefore be +LGPL v2.1, but don't believe me, ask your lawyers! + +diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure +--- dmalloc-5.5.2.orig/configure 2007-05-18 12:15:39.000000000 +0200 ++++ dmalloc-5.5.2/configure 2007-05-18 12:15:48.000000000 +0200 +@@ -7107,7 +7107,7 @@ + echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + cat >>confdefs.h <<\_ACEOF +-#define RETURN_MACROS_WORK 0 ++#define RETURN_MACROS_WORK 1 + _ACEOF + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +diff -dur dmalloc-5.5.2.orig/return.h dmalloc-5.5.2/return.h +--- dmalloc-5.5.2.orig/return.h 2007-05-14 19:26:14.000000000 +0200 ++++ dmalloc-5.5.2/return.h 2007-05-18 12:15:48.000000000 +0200 +@@ -106,26 +106,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + + /* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- +-/* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + diff --git a/patches/dmalloc/5.5.2/140-shared_library.patch b/patches/dmalloc/5.5.2/140-shared_library.patch new file mode 100644 index 00000000..ccf2bb28 --- /dev/null +++ b/patches/dmalloc/5.5.2/140-shared_library.patch @@ -0,0 +1,44 @@ +This patch makes building the shared library possible. + +Copyright 2007 Yann E. MORIN +Licensed to you as dmalloc-5.5.2 is. + +diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in +--- dmalloc-5.5.2.orig/Makefile.in 2007-05-14 19:26:14.000000000 +0200 ++++ dmalloc-5.5.2/Makefile.in 2007-05-18 15:54:04.000000000 +0200 +@@ -257,7 +257,7 @@ + # via: http://256.com/gray/email.html + $(LIB_SL) : $(LIBRARY) + rm -f $@ $@.t +- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) ++ @shlinkargs@ $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +@@ -270,7 +270,7 @@ + + $(LIB_TH_SL) : $(LIB_TH) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) ++ @shlinkargs@ $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +@@ -279,7 +279,7 @@ + + $(LIB_CXX_SL) : $(LIB_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +@@ -288,7 +288,7 @@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(LIB_TH_CXX) + mv $@.t $@ + + threadssl : $(LIB_TH_SL) diff --git a/patches/dmalloc/5.5.2/150-use_DESTDIR.patch b/patches/dmalloc/5.5.2/150-use_DESTDIR.patch new file mode 100644 index 00000000..072e3a75 --- /dev/null +++ b/patches/dmalloc/5.5.2/150-use_DESTDIR.patch @@ -0,0 +1,105 @@ +Make install rules use DESTDIR. +Split installation of the utilitity from the global install. + +Copyright 2007 Yann E. MORIN +Licensed to you as dmalloc-5.5.2 is. + +diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in +--- dmalloc-5.5.2.orig/Makefile.in 2007-05-18 16:03:31.000000000 +0200 ++++ dmalloc-5.5.2/Makefile.in 2007-05-18 16:22:59.000000000 +0200 +@@ -174,66 +174,67 @@ + # 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)/$(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" + + 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) +- @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" ++installutil : $(UTIL) ++ $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) ++ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir) ++ ++install : installincs installlib installutil installdocs + + dmalloc.h.2 : $(srcdir)/configure + $(SHELL) $(srcdir)/configure diff --git a/patches/dmalloc/5.5.2/160-strdup_macro.patch b/patches/dmalloc/5.5.2/160-strdup_macro.patch new file mode 100644 index 00000000..4974d140 --- /dev/null +++ b/patches/dmalloc/5.5.2/160-strdup_macro.patch @@ -0,0 +1,39 @@ +--- dmalloc-5.5.2.orig/configure 2008-06-17 13:10:09.000000000 +0200 ++++ dmalloc-5.5.2/configure 2008-06-17 13:11:25.000000000 +0200 +@@ -4691,8 +4691,35 @@ + echo "$as_me:$LINENO: checking strdup macro" >&5 + echo $ECHO_N "checking strdup macro... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then +- ac_cv_strdup_macro=no ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#if HAVE_STDLIB_H ++# include ++#endif ++ ++#ifndef strdup ++ choke me ++#endif + ++main() { exit(0); } ++ ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ ac_cv_strdup_macro=yes ++else ++ ac_cv_strdup_macro=no ++fi ++ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/patches/dmalloc/5.5.2/200-mips.patch b/patches/dmalloc/5.5.2/200-mips.patch deleted file mode 100644 index 69f0e450..00000000 --- a/patches/dmalloc/5.5.2/200-mips.patch +++ /dev/null @@ -1,64 +0,0 @@ -Patch to correctly handle the MIPS case. - -It was build up by Yann E. MORIN from some -bits gathered from buildroot, which is LGPL v2.1 -License for dmalloc is: - * Permission to use, copy, modify, and distribute this software for - * any purpose and without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies, and that the name of Gray Watson not be used in advertising - * or publicity pertaining to distribution of the document or software - * without specific, written prior permission. - * - * Gray Watson makes no representations about the suitability of the - * software described herein for any purpose. It is provided "as is" - * without express or implied warranty. - -I personnaly believe that the resulting code should therefore be -LGPL v2.1, but don't believe me, ask your lawyers! - -diff -dur dmalloc-5.5.2.orig/configure dmalloc-5.5.2/configure ---- dmalloc-5.5.2.orig/configure 2007-05-18 12:15:39.000000000 +0200 -+++ dmalloc-5.5.2/configure 2007-05-18 12:15:48.000000000 +0200 -@@ -7107,7 +7107,7 @@ - echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then - cat >>confdefs.h <<\_ACEOF --#define RETURN_MACROS_WORK 0 -+#define RETURN_MACROS_WORK 1 - _ACEOF - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -diff -dur dmalloc-5.5.2.orig/return.h dmalloc-5.5.2/return.h ---- dmalloc-5.5.2.orig/return.h 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/return.h 2007-05-18 12:15:48.000000000 +0200 -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - diff --git a/patches/dmalloc/5.5.2/300-shared_library.patch b/patches/dmalloc/5.5.2/300-shared_library.patch deleted file mode 100644 index ccf2bb28..00000000 --- a/patches/dmalloc/5.5.2/300-shared_library.patch +++ /dev/null @@ -1,44 +0,0 @@ -This patch makes building the shared library possible. - -Copyright 2007 Yann E. MORIN -Licensed to you as dmalloc-5.5.2 is. - -diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-14 19:26:14.000000000 +0200 -+++ dmalloc-5.5.2/Makefile.in 2007-05-18 15:54:04.000000000 +0200 -@@ -257,7 +257,7 @@ - # via: http://256.com/gray/email.html - $(LIB_SL) : $(LIBRARY) - rm -f $@ $@.t -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -+ @shlinkargs@ $(LIBRARY) - mv $@.t $@ - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -@@ -270,7 +270,7 @@ - - $(LIB_TH_SL) : $(LIB_TH) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -+ @shlinkargs@ $(LIB_TH) - mv $@.t $@ - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -@@ -279,7 +279,7 @@ - - $(LIB_CXX_SL) : $(LIB_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_CXX) - mv $@.t $@ - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -@@ -288,7 +288,7 @@ - - $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_TH_CXX) - mv $@.t $@ - - threadssl : $(LIB_TH_SL) diff --git a/patches/dmalloc/5.5.2/400-use_DESTDIR.patch b/patches/dmalloc/5.5.2/400-use_DESTDIR.patch deleted file mode 100644 index 072e3a75..00000000 --- a/patches/dmalloc/5.5.2/400-use_DESTDIR.patch +++ /dev/null @@ -1,105 +0,0 @@ -Make install rules use DESTDIR. -Split installation of the utilitity from the global install. - -Copyright 2007 Yann E. MORIN -Licensed to you as dmalloc-5.5.2 is. - -diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-18 16:03:31.000000000 +0200 -+++ dmalloc-5.5.2/Makefile.in 2007-05-18 16:22:59.000000000 +0200 -@@ -174,66 +174,67 @@ - # 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)/$(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" - - 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) -- @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" -+installutil : $(UTIL) -+ $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) -+ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir) -+ -+install : installincs installlib installutil installdocs - - dmalloc.h.2 : $(srcdir)/configure - $(SHELL) $(srcdir)/configure diff --git a/patches/dmalloc/5.5.2/500-strdup_macro.patch b/patches/dmalloc/5.5.2/500-strdup_macro.patch deleted file mode 100644 index 4974d140..00000000 --- a/patches/dmalloc/5.5.2/500-strdup_macro.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- dmalloc-5.5.2.orig/configure 2008-06-17 13:10:09.000000000 +0200 -+++ dmalloc-5.5.2/configure 2008-06-17 13:11:25.000000000 +0200 -@@ -4691,8 +4691,35 @@ - echo "$as_me:$LINENO: checking strdup macro" >&5 - echo $ECHO_N "checking strdup macro... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then -- ac_cv_strdup_macro=no -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#if HAVE_STDLIB_H -+# include -+#endif -+ -+#ifndef strdup -+ choke me -+#endif - -+main() { exit(0); } -+ -+_ACEOF -+rm -f conftest.o conftest.obj -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ ac_cv_strdup_macro=yes -+else -+ ac_cv_strdup_macro=no -+fi -+ - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -- cgit v1.2.3