* [Buildroot] [PATCH 7/7] libtool: avoid to patch ltmain.sh script in host-libtool package
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libtool/libtool.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index b57bca9..60fee9f 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -16,6 +16,8 @@ endef
HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL
+HOST_LIBTOOL_LIBTOOL_PATCH = NO
+
$(eval $(call AUTOTARGETS,package,libtool))
$(eval $(call AUTOTARGETS,package,libtool,host))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 6/7] libtool: bump to 2.2.10
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libtool/libtool.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index a996876..b57bca9 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -3,7 +3,7 @@
# libtool
#
#############################################################
-LIBTOOL_VERSION = 1.5.24
+LIBTOOL_VERSION = 2.2.10
LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 5/7] Removed libmpd-0.17.0-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that libmpd.mk has been converted to autotools infrastructure, the patch is
no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../libmpd/libmpd-0.17.0-libdir-la.patch | 89 --------------------
package/multimedia/libmpd/libmpd.mk | 1 -
2 files changed, 0 insertions(+), 90 deletions(-)
delete mode 100644 package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
diff --git a/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch b/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
deleted file mode 100644
index 561a338..0000000
--- a/package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
+++ /dev/null
@@ -1,89 +0,0 @@
----
- ltmain.sh | 39 +++++++++++++++++++++++++++++++++------
- 1 file changed, 33 insertions(+), 6 deletions(-)
-
-Index: libmpd-0.17.0/ltmain.sh
-===================================================================
---- libmpd-0.17.0.orig/ltmain.sh
-+++ libmpd-0.17.0/ltmain.sh
-@@ -1056,7 +1056,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- func_echo "unable to infer tagged configuration"
-- func_fatal_error "specify a tag with \`--tag'"
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# func_fatal_error "specify a tag with \`--tag'"
- # else
- # func_verbose "using $tagname tagged configuration"
- fi
-@@ -2025,8 +2027,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.
-- test "$inst_prefix_dir" = "$destdir" && \
-- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+ #
-+ # 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.
-@@ -5419,8 +5426,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
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -5571,7 +5584,7 @@
- *)
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ need_relink=no
- fi
- ;;
- esac
-@@ -5901,6 +5914,16 @@
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
- case $deplib in
-+# 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
- -L*) path="$deplib" ;;
- *.la)
- func_dirname "$deplib" "" "."
-@@ -8059,6 +8082,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)
- func_basename "$deplib"
diff --git a/package/multimedia/libmpd/libmpd.mk b/package/multimedia/libmpd/libmpd.mk
index 327f61a..47a802a 100644
--- a/package/multimedia/libmpd/libmpd.mk
+++ b/package/multimedia/libmpd/libmpd.mk
@@ -7,7 +7,6 @@ LIBMPD_VERSION = 0.17.0
LIBMPD_SOURCE = libmpd-$(LIBMPD_VERSION).tar.gz
LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION)/
LIBMPD_INSTALL_STAGING = YES
-LIBMPD_LIBTOOL_PATCH = NO
LIBMPD_DEPENDENCIES = libglib2
$(eval $(call AUTOTARGETS,package/multimedia,libmpd))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 4/7] Removed freetype-2.3.9-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that freetype.mk has been converted to autotools infrastructure, the patch
is no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/freetype/freetype-2.3.9-libdir-la.patch | 81 -----------------------
package/freetype/freetype.mk | 1 -
2 files changed, 0 insertions(+), 82 deletions(-)
delete mode 100644 package/freetype/freetype-2.3.9-libdir-la.patch
diff --git a/package/freetype/freetype-2.3.9-libdir-la.patch b/package/freetype/freetype-2.3.9-libdir-la.patch
deleted file mode 100644
index 76287ef..0000000
--- a/package/freetype/freetype-2.3.9-libdir-la.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -urN freetype-2.3.7.orig/builds/unix/ltmain.sh freetype-2.3.7/builds/unix/ltmain.sh
---- freetype-2.3.7.orig/builds/unix/ltmain.sh 2008-09-16 15:55:36.000000000 +0100
-+++ freetype-2.3.7/builds/unix/ltmain.sh 2008-09-22 09:18:36.000000000 +0100
-@@ -1047,8 +1047,9 @@
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
-- func_echo "unable to infer tagged configuration"
-- func_fatal_error "specify a tag with \`--tag'"
-+ func_echo "unable to infer tagged configuration"
-+ func_echo "$modename: defaulting to \`CC'"
-+ func_echo "$modename: if this is not correct, specify a tag with \`--tag'"
- # else
- # func_verbose "using $tagname tagged configuration"
- fi
-@@ -2017,8 +2018,11 @@
- # 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.
-- test "$inst_prefix_dir" = "$destdir" && \
-- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ #test "$inst_prefix_dir" = "$destdir" && \
-+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-@@ -4885,8 +4889,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
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -5408,13 +5418,16 @@
- ;;
- esac
- else
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-- test -z "$libdir" && \
-- func_fatal_error "\`$deplib' is not a valid libtool archive"
-- test "$absdir" != "$libdir" && \
-- func_warning "\`$deplib' seems to be moved"
--
-- path="-L$absdir"
-+# This interferes with crosscompilation. -CL
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# test -z "$libdir" && \
-+# func_fatal_error "\`$deplib' is not a valid libtool archive"
-+# test "$absdir" != "$libdir" && \
-+# func_warning "\`$deplib' seems to be moved"
-+#
-+# path="-L$absdir"
-+ path="-L$absdir/$objdir"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- fi
- ;;
- esac
-@@ -7520,6 +7533,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)
- func_basename "$deplib"
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index a2df1d8..c7e5c32 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -6,7 +6,6 @@
FREETYPE_VERSION = 2.3.12
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 3/7] Removed expat-libdir-la.patch
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
Now that expat.mk has been converted to autotools infrastructure, the patch is
no longer needed. Autotools will automatically apply the needed patch.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/expat/expat-libdir-la.patch | 77 -----------------------------------
package/expat/expat.mk | 1 -
2 files changed, 0 insertions(+), 78 deletions(-)
delete mode 100644 package/expat/expat-libdir-la.patch
diff --git a/package/expat/expat-libdir-la.patch b/package/expat/expat-libdir-la.patch
deleted file mode 100644
index 1c8930e..0000000
--- a/package/expat/expat-libdir-la.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700
-+++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700
-@@ -273,8 +273,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
-@@ -2404,8 +2405,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
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2886,6 +2893,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
-@@ -5598,6 +5615,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%^.*/%%'`
-@@ -5919,10 +5940,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.
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index f82a904..03b1303 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -7,7 +7,6 @@
EXPAT_VERSION = 2.0.1
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
-EXPAT_LIBTOOL_PATCH = NO
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_TARGET = YES
EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/7] Added the ability to patch ltmain.sh based on version
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
There are two versions of ltmain.sh in use in the buildroot system, 1.5.x and
2.2.x. buildroot-libtool.patch would only patch 1.5.x, which meant that for
2.2.x, a separate patch for the affected package had to be maintained. Modified
Makefile.autotools.in to check the version of ltmain.sh and apply the correct
patch.
---
package/Makefile.autotools.in | 27 ++++++++++---
package/buildroot-libtool-v1.5.patch | 69 ++++++++++++++++++++++++++++++++++
package/buildroot-libtool-v2.2.patch | 53 ++++++++++++++++++++++++++
package/buildroot-libtool.patch | 69 ----------------------------------
4 files changed, 143 insertions(+), 75 deletions(-)
create mode 100644 package/buildroot-libtool-v1.5.patch
create mode 100644 package/buildroot-libtool-v2.2.patch
delete mode 100644 package/buildroot-libtool.patch
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 589079b..950c79f 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -139,10 +139,16 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
#
define LIBTOOL_PATCH_HOOK
@$(call MESSAGE,"Patching libtool")
- $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \
- "$$($$(PKG)_AUTORECONF)" != "YES"; then \
- for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
- toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \
+ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \
+ -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \
+ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
+ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
+ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
+ if test $$$${ltmain_version} = '1.5'; then \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+ else \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+ fi \
done \
fi
endef
@@ -158,9 +164,18 @@ endif
define AUTORECONF_HOOK
@$(call MESSAGE,"Autoreconfiguring")
$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
- $(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
- toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
+ echo $$$${i}; \
+ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
+ echo $$$${ltmain_version}; \
+ if test $$$${ltmain_version} = "1.5"; then \
+ echo "Applying libtool patch 1.5"; \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+ else \
+ echo "Applying libtool patch 2.2"; \
+ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+ fi \
done \
fi
endef
diff --git a/package/buildroot-libtool-v1.5.patch b/package/buildroot-libtool-v1.5.patch
new file mode 100644
index 0000000..57a7c58
--- /dev/null
+++ b/package/buildroot-libtool-v1.5.patch
@@ -0,0 +1,69 @@
+--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
+@@ -273,8 +273,9 @@ func_infer_tag ()
+ # 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
+@@ -2407,8 +2408,14 @@ EOF
+ 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
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -2545,7 +2552,7 @@ EOF
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ # This is a shared library
+
+@@ -5606,6 +5623,10 @@ fi\
+ # 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%^.*/%%'`
+@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\""
+ # 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.
diff --git a/package/buildroot-libtool-v2.2.patch b/package/buildroot-libtool-v2.2.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/buildroot-libtool-v2.2.patch
@@ -0,0 +1,53 @@
+--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ # 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.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ 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
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ *)
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ # 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)
+ func_basename "$deplib"
diff --git a/package/buildroot-libtool.patch b/package/buildroot-libtool.patch
deleted file mode 100644
index 57a7c58..0000000
--- a/package/buildroot-libtool.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
-+++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
-@@ -273,8 +273,9 @@ func_infer_tag ()
- # 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
-@@ -2407,8 +2408,14 @@ EOF
- 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
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2545,7 +2552,7 @@ EOF
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ need_relink=no
- fi
- # This is a shared library
-
-@@ -5606,6 +5623,10 @@ fi\
- # 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%^.*/%%'`
-@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\""
- # 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.
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/7] BugFix - buildroot-libtool.patch - Removed Useless Code
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1286520909-3436-1-git-send-email-llandwerlin@gmail.com>
From: Martin Banky <martin.banky@gmail.com>
The code that was removed only added commented out code. It neither added
needed code nor commented out existing code.
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/buildroot-libtool.patch | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/package/buildroot-libtool.patch b/package/buildroot-libtool.patch
index 277719d..57a7c58 100644
--- a/package/buildroot-libtool.patch
+++ b/package/buildroot-libtool.patch
@@ -38,23 +38,6 @@
fi
# This is a shared library
-@@ -2889,6 +2896,16 @@ EOF
- 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
@@ -5606,6 +5623,10 @@ fi\
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
--
1.7.1
^ permalink raw reply related
* [Buildroot] [pull request] libtool enhancement
From: llandwerlin at gmail.com @ 2010-10-08 6:55 UTC (permalink / raw)
To: buildroot
Hello,
Here is a patch set mostly from Martin Banky to support libtool
patching depending on the libtool script version. This also bumps
libtool to version 2.2.10, so we can autoreconfigure packages
depending on libtool 2.2 versions (gtk+, glib, etc...).
You can pull from :
git://git.potipota.net/buildroot martins-libtool
Regards,
--
Lionel Landwerlin
^ permalink raw reply
* [Buildroot] [Bug 2677] introducing util-linux-ng as replacement for util-linux
From: bugzilla at busybox.net @ 2010-10-08 6:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2677-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2677
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
AssignedTo|unassigned at buildroot.uclibc |marcus.osdoba at googlemail.co
|.org |m
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2677] introducing util-linux-ng as replacement for util-linux
From: bugzilla at busybox.net @ 2010-10-08 6:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2677-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2677
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Priority|P5 |P4
Target Milestone|--- |2010.11
Severity|normal |enhancement
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2683] cups does not install correctly to target
From: bugzilla at busybox.net @ 2010-10-08 6:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2683-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2683
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
AssignedTo|unassigned at buildroot.uclibc |marcus.osdoba at googlemail.co
|.org |m
Target Milestone|--- |2010.11
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2683] New: cups does not install correctly to target
From: bugzilla at busybox.net @ 2010-10-08 6:25 UTC (permalink / raw)
To: buildroot
https://bugs.busybox.net/show_bug.cgi?id=2683
Summary: cups does not install correctly to target
Product: buildroot
Version: 2010.05
Platform: All
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P5
Component: Other
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: marcus.osdoba at googlemail.com
CC: buildroot at uclibc.org
Estimated Hours: 0.0
Created attachment 2587
--> https://bugs.busybox.net/attachment.cgi?id=2587
cups 1.4.4 and autotargets
cups installs its libraries into user/lib64, the attached patch converts to
autotargets and updates to newer version 1.4.4, libraries are installed
correctly, runs well on arm926
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2677] New: introducing util-linux-ng as replacement for util-linux
From: bugzilla at busybox.net @ 2010-10-08 6:22 UTC (permalink / raw)
To: buildroot
https://bugs.busybox.net/show_bug.cgi?id=2677
Summary: introducing util-linux-ng as replacement for
util-linux
Product: buildroot
Version: unspecified
Platform: All
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P5
Component: Other
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: marcus.osdoba at googlemail.com
CC: buildroot at uclibc.org
Estimated Hours: 0.0
Created attachment 2581
--> https://bugs.busybox.net/attachment.cgi?id=2581
introducing util-linux-NG
former version of util-linux is rather outdated, this version introduces the
stable version 2.17.2 used widely in distributions
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2389] Generate a Makefile wrapper in $(O)
From: bugzilla at busybox.net @ 2010-10-08 6:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2389-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2389
--- Comment #3 from Ossy <marcus.osdoba@googlemail.com> ---
Closed with commit aefad5317f2fd1645ace5a62b6b9643143093173
?
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2557] [PATCH] mkfs.xfs complains about missing libxfs.so.0
From: bugzilla at busybox.net @ 2010-10-08 6:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2557-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2557
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Attachment #2455|0 |1
is obsolete| |
--- Comment #3 from Ossy <marcus.osdoba@googlemail.com> ---
Comment on attachment 2455
--> https://bugs.busybox.net/attachment.cgi?id=2455
Fixes missing libs with xfsprogs
newer patch uses higher version and converts to autotargets
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2557] [PATCH] mkfs.xfs complains about missing libxfs.so.0
From: bugzilla at busybox.net @ 2010-10-08 6:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2557-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2557
--- Comment #2 from Ossy <marcus.osdoba@googlemail.com> ---
Created attachment 2575
--> https://bugs.busybox.net/attachment.cgi?id=2575
xfsprogs 3.1.3 may use util-linux-ng
converts to autotargets and uses libuuid
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 2557] [PATCH] mkfs.xfs complains about missing libxfs.so.0
From: bugzilla at busybox.net @ 2010-10-08 6:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-2557-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=2557
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Priority|P5 |P4
Platform|PC |All
AssignedTo|unassigned at buildroot.uclibc |marcus.osdoba at googlemail.co
|.org |m
Severity|minor |normal
--- Comment #1 from Ossy <marcus.osdoba@googlemail.com> ---
Xfsprogs currently uses the old infrastructure. I updated it to the newer
version 3.1.3 and autotargets. This version on xfsprogs may use the libuuid of
util-linux-ng (introduced in another patch) or the libuuid of e2fsxprogs (no
need of util-linux-ng).
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 743] Add Transmission bit torrent option to buildroot
From: bugzilla at busybox.net @ 2010-10-08 6:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-743-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=743
Ossy <marcus.osdoba@googlemail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Priority|P5 |P4
Platform|PC |All
AssignedTo|unassigned at buildroot.uclibc |marcus.osdoba at googlemail.co
|.org |m
Target Milestone|2010.05 |2010.11
--- Comment #7 from Ossy <marcus.osdoba@googlemail.com> ---
The last patch includes the changes proposed by Thomas.
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 743] Add Transmission bit torrent option to buildroot
From: bugzilla at busybox.net @ 2010-10-08 6:01 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-743-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=743
--- Comment #6 from Ossy <marcus.osdoba@googlemail.com> ---
Created attachment 2569
--> https://bugs.busybox.net/attachment.cgi?id=2569
patch for adding transmission 2.04 to br
Obsoletes the former patch for version < 2.04
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] buildroot not support c++ compliing
From: olyvine.chen at logiways.com.cn @ 2010-10-08 4:23 UTC (permalink / raw)
To: buildroot
Dear all,
I now try to add package libmusicbrainz to buildroot, but many errors
happen, such as the following:
*************************************************************************
buildroot/output/build/libmusicbrainz-3.0.2/src/artist.cpp:23:18: error:
string: No such file or directory
*************************************************************************
it seems indicate that no c++ library available, then how to enable c
++ compiling for buildroot?
I enabled glibc via:
Toolchain => Toolchain type (External toolchain) => External toolchain
C library (glibc)
Kindest regards!
Olyvine
^ permalink raw reply
* [Buildroot] Xterm: undefined reference to __longjmp_chk
From: Massimiliano Marretta @ 2010-10-07 18:19 UTC (permalink / raw)
To: buildroot
Hi,
I'm using the buildroot 2010.08 version with crosstool-ng toolchain. The
target is an x86 i686.
I receive this error wit xterm compilation:
charproc.o: In function `VTReset':
charproc.c:(.text+0x2623): undefined reference to `__longjmp_chk'
main.o: In function `hungtty':
main.c:(.text+0x867): undefined reference to `__longjmp_chk'
misc.o: In function `end_vt_mode':
misc.c:(.text+0x3a3): undefined reference to `__longjmp_chk'
misc.o: In function `end_tek_mode':
misc.c:(.text+0x3c7): undefined reference to `__longjmp_chk'
Tekproc.o: In function `Tinput':
Tekproc.c:(.text+0x1336): undefined reference to `__longjmp_chk'
collect2: ld returned 1 exit status
make[1]: *** [xterm] Error 1
make[1]: Leaving directory
`/srv/source/buildroot-2010.08/output/build/xterm-259'
make: ***
[/srv/source/buildroot-2010.08/output/build/xterm-259/.stamp_built] Error 2
--
Massimiliano Marretta
Via Zuccola 11
41015 Nonantola (Mo) - Italy
tel: +39 347 5340305
skype: mmarretta
/mailto:max at marretta.com/
/web:www.marretta.com/ <http://www.marretta.com>
^ permalink raw reply
* [Buildroot] Tentative conclusion on the libtool work
From: Lionel Landwerlin @ 2010-10-07 16:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20101007165744.490fca33@surf>
On Thu, Oct 7, 2010 at 4:57 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> On Tue, 28 Sep 2010 22:36:52 +0200
> Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
>
>> In my opinion, we should settle on a solution before mid-october, in
>> order to merge it before the end of october and give us enough time
>> for testing before the release at the end of november. Considering
>> how much time Martin and Lionel have dedicated to this issue, I think
>> that their respective work deserve some attention.
>
> >From the various comments on this list and discussions on IRC, it seems
> that the consensus is that :
>
> ?*) We should merge Martin Banky's work, as it keeps the existing
> ? ?known-working approach and just extends it to support packages that
> ? ?have used libtool 2.2 to generate their libtool script.
>
> ? ?Peter, if you're ok, I can give some build tests to Martin's work
> ? ?and send you a pull request for it.
>
> ?*) We should upgrade our own libtool package to libtool 2.2, so that
> ? ?packages such as libgtk2 that needs to be autoreconf'ed *and* need
> ? ?libtool >= 2.2 can actually be autoreconf'ed.
>
> ? ?Lionel, would you mind preparing such a patch set ?
>
> Do we agree on this solution ?
Yep, agree. I will send it tonight.
>
> Ideally, it'd be nice to merge it within the next few weeks, at least
> before the end of October, so that we can bump libgtk2 and have all
> this in 2010.11.
>
> Regards,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply
* [Buildroot] [pull request] WiFi, openssl, rrdtool, gpsd, pppd, netsnmp
From: Gustavo Zacarias @ 2010-10-07 15:11 UTC (permalink / raw)
To: buildroot
Some work on WiFi packages (wpa_supplicant & hostapd, latest stable).
Fix netsnmp build breakage.
Add gpsd.
Add rrdtool.
Fix/enhance pppd.
Upgrade openssl (now with arm asm optimizations).
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pull-request.txt
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101007/6b23cb61/attachment.txt>
^ permalink raw reply
* [Buildroot] Tentative conclusion on the libtool work
From: Thomas Petazzoni @ 2010-10-07 14:57 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20100928223652.6dc72083@surf>
On Tue, 28 Sep 2010 22:36:52 +0200
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> In my opinion, we should settle on a solution before mid-october, in
> order to merge it before the end of october and give us enough time
> for testing before the release at the end of november. Considering
> how much time Martin and Lionel have dedicated to this issue, I think
> that their respective work deserve some attention.
From the various comments on this list and discussions on IRC, it seems
that the consensus is that :
*) We should merge Martin Banky's work, as it keeps the existing
known-working approach and just extends it to support packages that
have used libtool 2.2 to generate their libtool script.
Peter, if you're ok, I can give some build tests to Martin's work
and send you a pull request for it.
*) We should upgrade our own libtool package to libtool 2.2, so that
packages such as libgtk2 that needs to be autoreconf'ed *and* need
libtool >= 2.2 can actually be autoreconf'ed.
Lionel, would you mind preparing such a patch set ?
Do we agree on this solution ?
Ideally, it'd be nice to merge it within the next few weeks, at least
before the end of October, so that we can bump libgtk2 and have all
this in 2010.11.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit master 1/1] package: add gst-ffmpeg
From: Peter Korsgaard @ 2010-10-07 14:00 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=55cc1fd5510fbf70ba5433f70c15c02e1c0de1a9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
ffmpeg plugin for gstreamer.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/multimedia/Config.in | 1 +
package/multimedia/gst-ffmpeg/Config.in | 16 ++++++++++++++++
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 18 ++++++++++++++++++
4 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 package/multimedia/gst-ffmpeg/Config.in
create mode 100644 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
diff --git a/CHANGES b/CHANGES
index c96bc4d..41406b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,7 @@
Alpha, Cris, IA64 and Sparc64 architecture support removed.
- New packages: libmpeg2, librsvg, xz
+ New packages: gst-ffmpeg, libmpeg2, librsvg, xz
Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 91def57..da50dbb 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -5,6 +5,7 @@ source "package/multimedia/aumix/Config.in"
source "package/multimedia/flac/Config.in"
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
+source "package/multimedia/gst-ffmpeg/Config.in"
source "package/multimedia/gst-plugins-base/Config.in"
source "package/multimedia/gst-plugins-good/Config.in"
source "package/multimedia/gst-plugins-bad/Config.in"
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
new file mode 100644
index 0000000..f5d01b9
--- /dev/null
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_GST_FFMPEG
+ bool "gst-ffmpeg"
+ depends on BR2_PACKAGE_GSTREAMER
+ select BR2_PACKAGE_GST_PLUGINS_BASE
+ select BR2_PACKAGE_FFMPEG
+ select BR2_PACKAGE_FFMPEG_GPL
+ select BR2_PACKAGE_FFMPEG_POSTPROC
+ select BR2_PACKAGE_FFMPEG_SWSCALE
+ depends on BR2_LARGEFILE
+ help
+ GStreamer plugin using FFmpeg.
+
+ http://gstreamer.freedesktop.org/
+
+comment "gst-ffmpeg requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
new file mode 100644
index 0000000..557c146
--- /dev/null
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# gst-ffmpeg
+#
+#############################################################
+GST_FFMPEG_VERSION = 0.10.9
+GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
+GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
+GST_FFMPEG_INSTALL_STAGING = YES
+GST_FFMPEG_LIBTOOL_PATCH = NO
+GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
+GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+GST_FFMPEG_DEPENDENCIES += bzip2
+endif
+
+$(eval $(call AUTOTARGETS,package/multimedia,gst-ffmpeg))
--
1.7.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox