[oe-commits] Chris Larson : Revert "autotools: symlink where we can"
git version control
git at git.openembedded.org
Sat Feb 26 10:51:51 UTC 2011
Module: openembedded.git
Branch: hipox
Commit: 25c59e0d8b944733e9cc7c58dea8fcb81d4b365f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=25c59e0d8b944733e9cc7c58dea8fcb81d4b365f
Author: Chris Larson <chris_larson at mentor.com>
Date: Fri Feb 25 08:09:35 2011 -0700
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 <chris_larson at mentor.com>
---
classes/autotools.bbclass | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index a88a4d1..9744589 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
}
More information about the Openembedded-commits
mailing list