Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 496006 | Differences between
and this patch

Collapse All | Expand All

(-)readline-6.2_p5.ebuild (-17 / +35 lines)
Lines 4-10 Link Here
4
4
5
EAPI="4"
5
EAPI="4"
6
6
7
inherit eutils multilib toolchain-funcs flag-o-matic
7
inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
8
8
9
# Official patches
9
# Official patches
10
# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/
10
# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/
Lines 37-43 SLOT="0" Link Here
37
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
37
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
38
IUSE="static-libs"
38
IUSE="static-libs"
39
39
40
RDEPEND=">=sys-libs/ncurses-5.2-r2"
40
RDEPEND=">=sys-libs/ncurses-5.2-r2[${MULTILIB_USEDEP}]
41
	abi_x86_32? (
42
		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
43
		!<=app-emulation/emul-linux-x86-baselibs-20131008-r6
44
	)"
41
DEPEND="${RDEPEND}"
45
DEPEND="${RDEPEND}"
42
46
43
S=${WORKDIR}/${MY_P}
47
S=${WORKDIR}/${MY_P}
Lines 71-103 src_configure() { Link Here
71
	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
75
	# http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
72
	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
76
	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
73
77
78
	# Make sure configure picks a better ar than `ar`. #484866
79
	export ac_cv_prog_AR=$(tc-getAR)
80
74
	# Force the test since we used sed above to force it.
81
	# Force the test since we used sed above to force it.
75
	export bash_cv_termcap_lib=ncurses
82
	export bash_cv_termcap_lib=ncurses
76
83
77
	# Make sure configure picks a better ar than `ar`. #484866
78
	tc-export AR
79
80
	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
84
	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
81
	# so we can re-use the config cache file between the two.
85
	# so we can re-use the config cache file between the two.
82
	append-ldflags -L.
86
	append-ldflags -L.
87
88
	multilib-minimal_src_configure
89
}
90
91
multilib_src_configure() {
92
	ECONF_SOURCE=${S} \
83
	econf \
93
	econf \
84
		--cache-file="${S}"/config.cache \
94
		--cache-file="${BUILD_DIR}"/config.cache \
85
		--with-curses \
95
		--with-curses \
86
		$(use_enable static-libs static)
96
		$(use_enable static-libs static)
87
97
88
	if ! tc-is-cross-compiler ; then
98
	if multilib_build_binaries && ! tc-is-cross-compiler ; then
89
		# code is full of AC_TRY_RUN()
99
		# code is full of AC_TRY_RUN()
90
		cd examples/rlfe
100
		mkdir -p examples/rlfe || die
91
		econf --cache-file="${S}"/config.cache
101
		cd examples/rlfe || die
102
		ECONF_SOURCE=${S}/examples/rlfe \
103
		econf --cache-file="${BUILD_DIR}"/config.cache
92
	fi
104
	fi
93
}
105
}
94
106
95
src_compile() {
107
multilib_src_compile() {
96
	emake
108
	emake
97
109
98
	if ! tc-is-cross-compiler ; then
110
	if multilib_build_binaries && ! tc-is-cross-compiler ; then
99
		# code is full of AC_TRY_RUN()
111
		# code is full of AC_TRY_RUN()
100
		cd examples/rlfe
112
		cd examples/rlfe || die
101
		local l
113
		local l
102
		for l in readline history ; do
114
		for l in readline history ; do
103
			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
115
			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
Lines 107-124 src_compile() { Link Here
107
	fi
119
	fi
108
}
120
}
109
121
110
src_install() {
122
multilib_src_install() {
111
	default
123
	default
112
	gen_usr_ldscript -a readline history #4411
113
124
114
	if ! tc-is-cross-compiler; then
125
	if multilib_build_binaries ; then
115
		dobin examples/rlfe/rlfe
126
		gen_usr_ldscript -a readline history #4411
127
128
		if ! tc-is-cross-compiler; then
129
			dobin examples/rlfe/rlfe
130
		fi
116
	fi
131
	fi
132
}
117
133
134
multilib_src_install_all() {
135
	einstalldocs
118
	dodoc USAGE
136
	dodoc USAGE
137
	dohtml -r doc/.
119
	docinto ps
138
	docinto ps
120
	dodoc doc/*.ps
139
	dodoc doc/*.ps
121
	dohtml -r doc
122
}
140
}
123
141
124
pkg_preinst() {
142
pkg_preinst() {

Return to bug 496006