diff options
| author |   Keri Harris <keri@gentoo.org> | 2012-07-04 18:29:36 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2012-07-04 18:29:36 +0000 |
| commit | 4618de1591223f56a7ed014cd0400e15ec3eca03 (patch) | |
| tree | f3b6a1f30aa83ed1c4ad90fb23540c3d5aca737e /dev-lang | |
| parent | epunt_cxx to avoid C++ /lib/cpp requirement wrt #424689 by Sylvain BERTRAND (diff) | |
| download | gentoo-2-4618de1591223f56a7ed014cd0400e15ec3eca03.tar.gz gentoo-2-4618de1591223f56a7ed014cd0400e15ec3eca03.tar.bz2 gentoo-2-4618de1591223f56a7ed014cd0400e15ec3eca03.zip | |
Fix up binary symlinks in gprolog install. Closes #424323
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/gprolog/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/gprolog/files/gprolog-1.4.0-links.patch | 15 | ||||
| -rw-r--r-- | dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch | 9 | ||||
| -rw-r--r-- | dev-lang/gprolog/gprolog-1.4.0.ebuild | 3 |
4 files changed, 22 insertions, 11 deletions
diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog index bfc1dca3f525..ec10abdb3376 100644 --- a/dev-lang/gprolog/ChangeLog +++ b/dev-lang/gprolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/gprolog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.57 2012/07/02 11:52:49 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.58 2012/07/04 18:29:36 keri Exp $ + + 04 Jul 2012; <keri@gentoo.org> gprolog-1.4.0.ebuild, + +files/gprolog-1.4.0-links.patch, files/gprolog-1.4.0-nodocs.patch: + Fix up binary symlinks in gprolog install. Closes #424323 *gprolog-1.4.1 (02 Jul 2012) diff --git a/dev-lang/gprolog/files/gprolog-1.4.0-links.patch b/dev-lang/gprolog/files/gprolog-1.4.0-links.patch new file mode 100644 index 000000000000..fc8c1191f9fc --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.4.0-links.patch @@ -0,0 +1,15 @@ +--- gprolog-1.4.0.orig/src/Makefile.in 2011-04-08 18:35:22.000000000 +0200 ++++ gprolog-1.4.0/src/Makefile.in 2012-07-04 09:46:49.000000000 +0200 +@@ -81,10 +81,10 @@ + + # --- Links --- # + +-install-links: uninstall-links ++install-links: + if test $(LINKS_DIR) != none; then \ + ./mkinstalldirs $(LINKS_DIR); \ +- (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \ ++ (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \ + fi + + uninstall-links: diff --git a/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch index b68ee7d8ea00..ff6e2bd30d38 100644 --- a/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch +++ b/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch @@ -1,14 +1,5 @@ --- gprolog-1.4.0.orig/src/Makefile.in 2011-04-09 04:35:22.000000000 +1200 +++ gprolog-1.4.0/src/Makefile.in 2011-07-02 08:25:22.000000000 +1200 -@@ -82,7 +81,7 @@ - # --- Links --- # - - install-links: uninstall-links -- if test $(LINKS_DIR) != none; then \ -+ if test $(LINKS_DIR) != $(DESTDIR)none; then \ - ./mkinstalldirs $(LINKS_DIR); \ - (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \ - fi @@ -97,7 +96,7 @@ # --- Documentation --- # diff --git a/dev-lang/gprolog/gprolog-1.4.0.ebuild b/dev-lang/gprolog/gprolog-1.4.0.ebuild index 422adaaa4909..eb4b21facaaf 100644 --- a/dev-lang/gprolog/gprolog-1.4.0.ebuild +++ b/dev-lang/gprolog/gprolog-1.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.10 2012/06/06 03:08:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.11 2012/07/04 18:29:36 keri Exp $ EAPI=2 @@ -21,6 +21,7 @@ RDEPEND="" src_prepare() { epatch "${FILESDIR}"/${P}-ldflags.patch + epatch "${FILESDIR}"/${P}-links.patch epatch "${FILESDIR}"/${P}-ma2asm-pllong.patch epatch "${FILESDIR}"/${P}-nodocs.patch epatch "${FILESDIR}"/${P}-txt-file.patch |