1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

Rename /openembedded/ -> /meta/

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-07-21 10:10:31 +00:00
parent 2cf0eadf9f
commit b2f192faab
1725 changed files with 6 additions and 6 deletions
+29
View File
@@ -0,0 +1,29 @@
--- /tmp/ltmain.in 2005-07-24 18:52:11.867735112 +0200
+++ libtool-1.5.10/ltmain.in 2005-07-24 18:55:49.204694872 +0200
@@ -3101,7 +3101,7 @@
# Check that each of the things are valid numbers.
case $current in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0 | [1-9] | [1-9][0-9]*) ;;
*)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -3110,7 +3110,7 @@
esac
case $revision in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0 | [1-9] | [1-9][0-9]*) ;;
*)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -3119,7 +3119,7 @@
esac
case $age in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0 | [1-9] | [1-9][0-9]*) ;;
*)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
+127
View File
@@ -0,0 +1,127 @@
diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
--- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
+++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([main.c])
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac
--- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500
+++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([demo], [1.0], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([hello.c])
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am
--- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
+++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400
@@ -121,17 +121,16 @@
# This is one of the essential tests for deplibs_check_method=pass_all.
# If this one passes with pass_all, it is likely that pass_all works
-EXTRA_LIBRARIES = libhell0.a
-libhell0_a_SOURCES = hello.c foo.c
-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
+libhell0_la_SOURCES = hello.c foo.c
libhell1_la_SOURCES = hell1.c
libhell1_la_LIBADD = -L. -lhell0
libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
-libhell1_la_DEPENDENCIES = libhell0.a
+libhell1_la_DEPENDENCIES = libhell0.la
libhell2_la_SOURCES = hell2.c
libhell2_la_LIBADD = -L. -lhell0
libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
-libhell2_la_DEPENDENCIES = libhell0.a
+libhell2_la_DEPENDENCIES = libhell0.la
EXTRA_PROGRAMS = hell0
hell0_SOURCES = main.c
hell0_LDADD = libhell1.la libhell2.la $(LIBM)
diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac
--- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400
+++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([main.c])
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac
--- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500
+++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -23,6 +23,7 @@
## ------------------------ ##
AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([foof.f])dnl
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
## Automake Initialisation. ##
diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac
--- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
+++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([main.c])
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac
--- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
+++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([longer_file_name_hello.c])
+AC_CONFIG_AUX_DIR([..])
## ------------------------ ##
diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am
--- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
+++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400
@@ -121,17 +121,16 @@
# This is one of the essential tests for deplibs_check_method=pass_all.
# If this one passes with pass_all, it is likely that pass_all works
-EXTRA_LIBRARIES = libhell0.a
-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
+libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
libhell1_la_SOURCES = longer_file_name_hell1.c
libhell1_la_LIBADD = -L. -lhell0
libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
-libhell1_la_DEPENDENCIES = libhell0.a
+libhell1_la_DEPENDENCIES = libhell0.la
libhell2_la_SOURCES = longer_file_name_hell2.c
libhell2_la_LIBADD = -L. -lhell0
libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
-libhell2_la_DEPENDENCIES = libhell0.a
+libhell2_la_DEPENDENCIES = libhell0.la
EXTRA_PROGRAMS = hell0
hell0_SOURCES = longer_file_name_main.c
hell0_LDADD = libhell1.la libhell2.la $(LIBM)
diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac
--- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
+++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
@@ -24,6 +24,7 @@
## ------------------------ ##
AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org])
AC_CONFIG_SRCDIR([foo.cpp])
+AC_CONFIG_AUX_DIR([..])
AC_CANONICAL_TARGET
@@ -0,0 +1,25 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- libtool-1.5.6/ltmain.in~install-path-check 2004-05-14 22:56:19.000000000 -0500
+++ libtool-1.5.6/ltmain.in 2004-05-14 22:57:48.000000000 -0500
@@ -5503,10 +5503,13 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- if test "$inst_prefix_dir" = "$destdir"; then
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
- exit $EXIT_FAILURE
- fi
+ #
+ # This breaks install into our staging area. -PB
+ #
+ # if test "$inst_prefix_dir" = "$destdir"; then
+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ # exit $EXIT_FAILURE
+ # fi
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
+52
View File
@@ -0,0 +1,52 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
@@ -2147,8 +2147,14 @@
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$libdir"
- absdir="$libdir"
+ # Adding 'libdir' from the .la file to our library search paths
+ # breaks crosscompilation horribly. We cheat here and don't add
+ # it, instead adding the path where we found the .la. -CL
+ dir="$abs_ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ #dir="$libdir"
+ #absdir="$libdir"
fi
else
dir="$ladir/$objdir"
@@ -2615,6 +2621,16 @@
esac
if grep "^installed=no" $deplib > /dev/null; then
path="$absdir/$objdir"
+# This interferes with crosscompilation. -CL
+# else
+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+# if test -z "$libdir"; then
+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+# exit 1
+# fi
+# if test "$absdir" != "$libdir"; then
+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+# fi
else
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
@@ -5165,6 +5181,10 @@
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
+ # Replacing uninstalled with installed can easily break crosscompilation,
+ # since the installed path is generally the wrong architecture. -CL
+ newdependency_libs="$newdependency_libs $deplib"
+ continue
case $deplib in
*.la)
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+40
View File
@@ -0,0 +1,40 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- libtool-1.5.6/libtool.m4~prefix.patch 2004-05-14 23:02:28.000000000 -0500
+++ libtool-1.5.6/libtool.m4 2004-05-14 23:02:34.000000000 -0500
@@ -82,7 +82,8 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='$(SHELL) $(top_builddir)'
+LIBTOOL="$LIBTOOL/$host_alias-libtool"
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
@@ -149,7 +150,7 @@
rm="rm -f"
# Global variables:
-default_ofile=libtool
+default_ofile=${host_alias}-libtool
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except M$VC,
--- libtool-1.5.6/Makefile.am~prefix.patch 2004-04-11 00:07:06.000000000 -0500
+++ libtool-1.5.6/Makefile.am 2004-05-14 23:02:46.000000000 -0500
@@ -30,9 +30,9 @@
aclocal_DATA = $(aclocal_macros)
# The standalone libtool script, and the libtool distributor.
-bin_SCRIPTS = libtool libtoolize
+bin_SCRIPTS = $(host_alias)-libtool libtoolize
-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
+$(host_alias)-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
$(SHELL) $(top_builddir)/config.status --recheck
chmod +x $@
+16
View File
@@ -0,0 +1,16 @@
#
# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- libtool-1.5/ltmain.in~sedvar 2003-04-14 16:58:24.000000000 -0500
+++ libtool-1.5/ltmain.in 2003-09-24 14:18:50.175518400 -0500
@@ -48,6 +48,8 @@
exit 0
fi
+[ -z "${SED}" ] && SED=sed
+
# The name of this program.
progname=`$echo "$0" | ${SED} 's%^.*/%%'`
modename="$progname"
+19
View File
@@ -0,0 +1,19 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
+++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
@@ -226,8 +226,9 @@
# line option must be used.
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
+ $echo "$modename: defaulting to \`CC'"
+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
+# exit $EXIT_FAILURE
# else
# $echo "$modename: using $tagname tagged configuration"
fi
+13
View File
@@ -0,0 +1,13 @@
Index: libtool-1.5.10/libltdl/ltmain.sh
===================================================================
--- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100
+++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100
@@ -232,7 +232,7 @@
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
$echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
+# exit $EXIT_FAILURE
# else
# $echo "$modename: using $tagname tagged configuration"
fi
+19
View File
@@ -0,0 +1,19 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- libtool-1.5.8/libtool.m4~uclibc
+++ libtool-1.5.8/libtool.m4
@@ -2221,6 +2221,11 @@
lt_cv_deplibs_check_method=pass_all
;;
+linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -0,0 +1,27 @@
SECTION = "devel"
include libtool_${PV}.bb
PR = "r4"
PACKAGES = ""
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
file://prefix.patch;patch=1 \
file://tag.patch;patch=1 \
file://tag1.patch;patch=1 \
file://install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR}"
exec_prefix = "${prefix}/${BUILD_SYS}"
do_compile () {
:
}
do_stage () {
install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
}
do_install () {
:
}
@@ -0,0 +1,35 @@
SECTION = "devel"
include libtool_${PV}.bb
PR = "r4"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://libdir-la.patch;patch=1 \
file://prefix.patch;patch=1 \
file://tag.patch;patch=1 \
file://tag1.patch;patch=1 \
file://install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
STAGING_DATADIR_safe := "${STAGING_DATADIR}"
inherit native
do_stage () {
install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do
install -d $dir/libtool \
$dir/aclocal
install -c config.guess $dir/libtool/config.guess
install -c config.sub $dir/libtool/config.sub
install -c -m 0644 ltmain.sh $dir/libtool/
install -c -m 0644 libtool.m4 $dir/aclocal/
install -c -m 0644 ltdl.m4 $dir/aclocal/
done
}
do_install () {
:
}
+35
View File
@@ -0,0 +1,35 @@
DESCRIPTION = "Generic library support script \
This is GNU libtool, a generic library support script. Libtool hides \
the complexity of generating special library types (such as shared \
libraries) behind a consistent interface."
HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
LICENSE = "GPL"
SECTION = "devel"
PR = "r3"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://autotools.patch;patch=1 \
file://uclibc.patch;patch=1 \
file://3figures.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
PACKAGES = "libltdl libltdl-dev ${PN}"
FILES_${PN} += "${datadir}/aclocal*"
FILES_libltdl = "${libdir}/libltdl.so.*"
FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
inherit autotools
EXTRA_AUTORECONF = "--exclude=libtoolize"
do_configure () {
find ${S} -name acinclude.m4 | for m4 in `cat`; do
cat ${S}/libtool.m4 ${S}/ltdl.m4 > $m4
done
autotools_do_configure
}
do_stage () {
oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
}