diff options
| author |   Sandro Bonazzola <sanchan@gentoo.org> | 2006-10-12 20:23:22 +0000 |
|---|---|---|
| committer | Sandro Bonazzola <sanchan@gentoo.org> | 2006-10-12 20:23:22 +0000 |
| commit | 000e77ea4ab483454d15780f3d2bc82e9ff979a6 (patch) | |
| tree | d19b72c38334dda05240d6ed68d7aeadfb1a49ae /dev-libs/popt | |
| parent | New version for translation updates (diff) | |
| download | gentoo-2-000e77ea4ab483454d15780f3d2bc82e9ff979a6.tar.gz gentoo-2-000e77ea4ab483454d15780f3d2bc82e9ff979a6.tar.bz2 gentoo-2-000e77ea4ab483454d15780f3d2bc82e9ff979a6.zip | |
lib64 patch updated with the one provided by Roy Marples fixing bug #150984. The patch solves both multilib behaviour and lib6464 previously fixed.
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'dev-libs/popt')
| -rw-r--r-- | dev-libs/popt/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/popt/files/popt-1.10.4-lib64.patch | 36 |
2 files changed, 30 insertions, 13 deletions
diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog index daf561f5402a..dba879b6cf04 100644 --- a/dev-libs/popt/ChangeLog +++ b/dev-libs/popt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/popt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.35 2006/10/09 18:46:52 sanchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.36 2006/10/12 20:23:22 sanchan Exp $ + + 12 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> + files/popt-1.10.4-lib64.patch: + lib64 patch updated with the one provided by Roy Marples fixing bug #150984. + The patch solves both multilib behaviour and lib6464 previously fixed. 09 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> +files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild: diff --git a/dev-libs/popt/files/popt-1.10.4-lib64.patch b/dev-libs/popt/files/popt-1.10.4-lib64.patch index d4711640f9d2..6cf5389f397a 100644 --- a/dev-libs/popt/files/popt-1.10.4-lib64.patch +++ b/dev-libs/popt/files/popt-1.10.4-lib64.patch @@ -1,17 +1,29 @@ ---- configure.ac.orig 2006-09-10 13:14:22.000000000 -0400 -+++ configure.ac 2006-09-10 13:13:53.000000000 -0400 -@@ -61,9 +61,11 @@ +diff -ru popt-1.10.4.orig/Makefile.am popt-1.10.4/Makefile.am +--- popt-1.10.4.orig/Makefile.am 2005-09-16 14:19:21 +0100 ++++ popt-1.10.4/Makefile.am 2006-10-12 09:36:16 +0100 +@@ -35,7 +35,7 @@ - dnl XXX Choose /usr/lib or /usr/lib64 for library installs. - MARK64= + include_HEADERS = popt.h + +-usrlibdir = $(libdir)@MARK64@ ++usrlibdir = $(libdir) + usrlib_LTLIBRARIES = libpopt.la + + libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c +diff -ru popt-1.10.4.orig/configure.ac popt-1.10.4/configure.ac +--- popt-1.10.4.orig/configure.ac 2005-11-17 20:14:31 +0000 ++++ popt-1.10.4/configure.ac 2006-10-12 09:35:59 +0100 +@@ -59,13 +59,6 @@ + fi + AC_SUBST(TARGET) + +-dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +-MARK64= -case "${target_cpu}" in -x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; -esac -+if ! echo "${libdir}" | ${EGREP} -q '64$' ; then -+ case "${target_cpu}" in -+ x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; -+ esac -+fi - AC_SUBST(MARK64) - +-AC_SUBST(MARK64) +- AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) + AC_MSG_CHECKING(for /usr/ucblib in LIBS) + if test -d /usr/ucblib ; then |