From cec0767b1a223289595fa56cda1ed1d9bc8ad2c3 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 25 Feb 2011 08:09:35 -0700 Subject: Revert "autotools: symlink where we can" This is nice in theory, but there's a risk that a broken source tree could try to modify the files through the symlinks, screwing up everybody else using them. Of course, per-recipe sysroots would resolve this, so we can revisit this if/when that gets implemented. This reverts commit 302395545185b4e85bf76a8f319bc71bd3a7be1d. Signed-off-by: Chris Larson --- classes/autotools.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index a88a4d1e30..974458928a 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -137,11 +137,11 @@ oe_autoreconf () { if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then : do nothing -- we still have an old unmodified configure.ac else - echo "no" | glib-gettextize --force + echo "no" | glib-gettextize --force --copy fi else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then - ln -sf ${STAGING_DATADIR}/gettext/config.rpath ${S}/ + cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/ else oenote ${STAGING_DATADIR}/gettext/config.rpath not found. gettext is not installed. fi @@ -151,9 +151,9 @@ oe_autoreconf () { for aux in m4 `sed -n -e '/^[[:space:]]*AC_CONFIG_MACRO_DIR/s|[^(]*([[]*\([^])]*\)[]]*)|\1|p' $CONFIGURE_AC`; do mkdir -p ${aux} done - autoreconf -Wcross --verbose --install --symlink --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." + autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then - intltoolize --force --automake + intltoolize --copy --force --automake fi } -- cgit 1.2.3-korg