diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2005-10-30 20:14:52 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2005-10-30 20:14:52 +0000 |
| commit | cd5c70b23032113bbadb3552c5dd5f8315b41ab5 (patch) | |
| tree | 644ac327bd493c6026cfdd285f149e086a457267 | |
| parent | Marked Stable on amd64. See bug #109889. (diff) | |
| download | gentoo-2-cd5c70b23032113bbadb3552c5dd5f8315b41ab5.tar.gz gentoo-2-cd5c70b23032113bbadb3552c5dd5f8315b41ab5.tar.bz2 gentoo-2-cd5c70b23032113bbadb3552c5dd5f8315b41ab5.zip | |
Fixed compilation and install issues on OSX. There is no malloc.h and /usr/bin/install doesn't understand -D.
(Portage version: 2.0.51.22-r3)
| -rw-r--r-- | app-arch/lha/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/lha/Manifest | 20 | ||||
| -rw-r--r-- | app-arch/lha/files/lha-114i-build.patch | 10 | ||||
| -rw-r--r-- | app-arch/lha/files/lha-114i-malloc.patch | 4 |
4 files changed, 20 insertions, 21 deletions
diff --git a/app-arch/lha/ChangeLog b/app-arch/lha/ChangeLog index 140a962fa138..02f1fdcd3ad8 100644 --- a/app-arch/lha/ChangeLog +++ b/app-arch/lha/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/lha # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.24 2005/10/30 05:33:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.25 2005/10/30 20:14:52 grobian Exp $ + + 30 Oct 2005; Fabian Groffen <grobian@gentoo.org> + files/lha-114i-build.patch, files/lha-114i-malloc.patch: + Fixed compilation and install issues on OSX. There is no malloc.h and + /usr/bin/install doesn't understand -D. *lha-114i-r5 (30 Oct 2005) diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest index f72cbde569c6..19f143cc8108 100644 --- a/app-arch/lha/Manifest +++ b/app-arch/lha/Manifest @@ -1,20 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 87f8394a1eaec58d059d1283e326daac lha-114i-r5.ebuild 1107 MD5 e470eb5963d8ee09bfd2727eeb56bba2 ChangeLog 3054 -MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r5 59 -MD5 2be58a222a07490e0347f138f65c97d4 files/lha-114i-build.patch 1341 +MD5 a1ef659783bc7224c48dbc07cf436788 files/lha-114i-sec.patch 1621 MD5 bf52f3a88c9f88cdbaadda926050333e files/lha-114i-detect-cmd-extract-fail.patch 3151 +MD5 6cea43d9473cb137305f2a1c9175eac6 files/lha-114i-build.patch 1450 MD5 de7e57548c17115a6a39b8cb5f88234d files/lha-114i-dir_length_bounds_check.patch 502 -MD5 254ee5496c0968b19e8e1a20c3b90289 files/lha-114i-malloc.patch 180 -MD5 a1ef659783bc7224c48dbc07cf436788 files/lha-114i-sec.patch 1621 +MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r5 59 +MD5 07b705eca29332c442fab7a7cd7877ce files/lha-114i-malloc.patch 207 MD5 f44e42e6131c63f0e2e67e49732b6e57 files/lha-114i-sec2.patch 5754 MD5 d409c5c0a2b75a477e7baa7ebc62a559 files/lha-114i-symlink.patch 228 -MD5 87f8394a1eaec58d059d1283e326daac lha-114i-r5.ebuild 1107 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDZFs+gIKl8Uu19MoRAnYgAJ9ge/iE8+AU14oaU1T2Gw01qhKuAACaA4IV -RdZKdfcrtbgZ8991ErJZWhQ= -=9zmV ------END PGP SIGNATURE----- diff --git a/app-arch/lha/files/lha-114i-build.patch b/app-arch/lha/files/lha-114i-build.patch index 23d241ff73ed..29895b329fe3 100644 --- a/app-arch/lha/files/lha-114i-build.patch +++ b/app-arch/lha/files/lha-114i-build.patch @@ -31,20 +31,22 @@ 'OPTIMIZE=$(OPTIMIZE)' 'MACHINE=$(MACHINE)' --- man/Makefile +++ man/Makefile -@@ -11,7 +11,7 @@ +@@ -11,7 +11,8 @@ $(NROFF) -man lha.n > lha.man install: - $(INSTALL) $(INSTALLMAN) lha.n $(MANDIR)/man$(MANSECT)/lha.$(MANSECT) -+ $(INSTALL) -D $(INSTALLMAN) lha.n $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT) ++ mkdir -p `dirname $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT)` ++ $(INSTALL) $(INSTALLMAN) lha.n $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT) clean: rm -f *~ --- src/Makefile +++ src/Makefile -@@ -49,4 +49,4 @@ +@@ -49,4 +49,5 @@ rm -f core *.o lha.tar lha.tar.Z *~ \#* *.orig install: ++ mkdir -p `dirname $(DESTDIR)$(BINDIR)/lha` ++ $(INSTALL) $(INSTALLBIN) lha $(DESTDIR)$(BINDIR)/lha - $(INSTALL) $(INSTALLBIN) lha $(BINDIR)/lha -+ $(INSTALL) -D $(INSTALLBIN) lha $(DESTDIR)$(BINDIR)/lha diff --git a/app-arch/lha/files/lha-114i-malloc.patch b/app-arch/lha/files/lha-114i-malloc.patch index 9f4499aecaff..8c9d968a9d58 100644 --- a/app-arch/lha/files/lha-114i-malloc.patch +++ b/app-arch/lha/files/lha-114i-malloc.patch @@ -1,10 +1,12 @@ --- lha-114i/src/lha.h +++ lha-114i/src/lha.h -@@ -16,6 +16,7 @@ +@@ -16,6 +16,9 @@ #include <sys/types.h> #include <sys/file.h> #include <sys/stat.h> ++#ifndef __APPLE__ +#include <malloc.h> ++#endif #include <signal.h> |