Index: libselinux-2.2.2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.2.2-r1.ebuild,v retrieving revision 1.1 diff -u -p -r1.1 libselinux-2.2.2-r1.ebuild --- libselinux-2.2.2-r1.ebuild 2 Feb 2014 15:38:07 -0000 1.1 +++ libselinux-2.2.2-r1.ebuild 8 Feb 2014 10:54:53 -0000 @@ -32,6 +32,7 @@ src_prepare() { EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \ EPATCH_FORCE="yes" \ epatch + epatch "${FILESDIR}"/${PN}-2.2.2-build.patch epatch_user @@ -39,17 +40,27 @@ src_prepare() { } multilib_src_compile() { - tc-export RANLIB + tc-export PKG_CONFIG RANLIB + local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) + local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) + export PCRE_{CFLAGS,LIBS} emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ - LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS} -lpthread" all + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + all if multilib_is_native_abi && use python; then building() { python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH - emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLIBDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS} -lpthread" pywrap + emake \ + CC="$(tc-getCC)" \ + PYINC="-I${PYTHON_INCLUDEDIR}" \ + PYTHONLIBDIR="${PYTHON_LIBPATH}" \ + PYPREFIX="${EPYTHON##*/}" \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + pywrap } python_foreach_impl building fi