diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-12-28 10:47:53 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-12-28 10:47:53 +0000 |
| commit | cbf641413582292da0da5f6df657ee51f8bb4f20 (patch) | |
| tree | dfe1ed757bd1381c3711f4f38ad1781a13b31828 /app-misc | |
| parent | Stable for ppc, wrt bug #448948 (diff) | |
| download | gentoo-2-cbf641413582292da0da5f6df657ee51f8bb4f20.tar.gz gentoo-2-cbf641413582292da0da5f6df657ee51f8bb4f20.tar.bz2 gentoo-2-cbf641413582292da0da5f6df657ee51f8bb4f20.zip | |
Add back libintl bits for e.g. Solaris 10
(Portage version: 2.2.01.21418-prefix/cvs/SunOS sparc, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/getopt/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-libintl.patch | 11 | ||||
| -rw-r--r-- | app-misc/getopt/getopt-1.1.5.ebuild | 12 |
3 files changed, 25 insertions, 4 deletions
diff --git a/app-misc/getopt/ChangeLog b/app-misc/getopt/ChangeLog index 423e1f276f1f..d77b4a564ab3 100644 --- a/app-misc/getopt/ChangeLog +++ b/app-misc/getopt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/getopt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.8 2012/12/28 09:10:26 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.9 2012/12/28 10:47:53 grobian Exp $ + + 28 Dec 2012; Fabian Groffen <grobian@gentoo.org> + +files/getopt-1.1.5-libintl.patch, getopt-1.1.5.ebuild: + Add back libintl bits for e.g. Solaris 10 *getopt-1.1.5 (28 Dec 2012) diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch new file mode 100644 index 000000000000..b40367105ed0 --- /dev/null +++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2012-12-28 11:40:09.524686698 +0100 ++++ Makefile 2012-12-28 11:41:20.646157275 +0100 +@@ -61,7 +61,7 @@ + -$(RM) $(objects) $(binaries) + + getopt: $(objects) +- $(CC) $(LDFLAGS) -o $@ $(objects) ++ $(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL) + + install: getopt install_po + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) diff --git a/app-misc/getopt/getopt-1.1.5.ebuild b/app-misc/getopt/getopt-1.1.5.ebuild index d47c904dd22b..3d7be230035a 100644 --- a/app-misc/getopt/getopt-1.1.5.ebuild +++ b/app-misc/getopt/getopt-1.1.5.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/app-misc/getopt/getopt-1.1.5.ebuild,v 1.1 2012/12/28 09:10:26 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.2 2012/12/28 10:47:53 grobian Exp $ EAPI=3 @@ -20,6 +20,7 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { + epatch "${FILESDIR}"/${P}-libintl.patch epatch "${FILESDIR}"/${P}-setlocale.patch epatch "${FILESDIR}"/${P}-longrename.patch @@ -29,15 +30,20 @@ src_prepare() { src_compile() { local nogettext="1" + local libintl="" local libcgetopt=1 - use nls && nogettext=0 + if use nls; then + nogettext=0 + has_version sys-libs/glibc || libintl="-lintl" + fi + [[ ${CHOST} == *-irix* ]] && libcgetopt=0 [[ ${CHOST} == *-interix* ]] && libcgetopt=0 emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \ LIBCGETOPT=${libcgetopt} \ - WITHOUT_GETTEXT=${nogettext} \ + WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed" } |