diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-03-15 18:17:14 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-03-15 18:17:14 +0000 |
| commit | dea70574b92e5bbde5ac1d1dd9d19cddb45c49d9 (patch) | |
| tree | 6a76b894bad5ee1896e824fde0cb78cc51a2b9e6 /dev-libs/dmalloc/files | |
| parent | Fixed manifest (contained a .rej file) (diff) | |
| download | historical-dea70574b92e5bbde5ac1d1dd9d19cddb45c49d9.tar.gz historical-dea70574b92e5bbde5ac1d1dd9d19cddb45c49d9.tar.bz2 historical-dea70574b92e5bbde5ac1d1dd9d19cddb45c49d9.zip | |
Respect AR. Clean up patches.
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'dev-libs/dmalloc/files')
4 files changed, 17 insertions, 8 deletions
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 index 70e6e11062cd..92b232eb58e9 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch @@ -1,6 +1,5 @@ -diff -ur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-14 20:26:14.000000000 +0300 -+++ dmalloc-5.5.2/Makefile.in 2007-12-27 19:23:54.000000000 +0200 +--- a/Makefile.in ++++ b/Makefile.in @@ -41,7 +41,7 @@ # thread version of the library diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch new file mode 100644 index 000000000000..56be2fa3ef4e --- /dev/null +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch @@ -0,0 +1,11 @@ +--- 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 index c4d0b22f9c0a..0fa01e105c53 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch @@ -1,6 +1,5 @@ -diff -ur dmalloc-5.5.2.orig/configure.ac dmalloc-5.5.2/configure.ac ---- dmalloc-5.5.2.orig/configure.ac 2007-05-14 20:26:14.000000000 +0300 -+++ dmalloc-5.5.2/configure.ac 2007-12-27 18:13:18.000000000 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -55,11 +55,12 @@ AC_PROG_CC AC_PROG_CXX diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch index 4016be0a21c0..c3cbd90aa9f5 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch @@ -1,5 +1,5 @@ ---- ./dmalloc-5.5.2/settings.dist.orig 2008-09-23 09:24:56.000000000 +0200 -+++ ./dmalloc-5.5.2/settings.dist 2008-09-23 09:25:27.000000000 +0200 +--- a/settings.dist ++++ b/settings.dist @@ -409,7 +409,7 @@ */ |