From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 12/21] libogg: bump to 1.2.0
Date: Sat, 18 Sep 2010 19:53:34 -0700 [thread overview]
Message-ID: <1284864823-18993-13-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1284864823-18993-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../libogg/libogg-1.2.0-buildroot-libtool.patch | 53 ++++++++++++++++++++
package/multimedia/libogg/libogg.mk | 3 +-
2 files changed, 55 insertions(+), 1 deletions(-)
create mode 100644 package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch
diff --git a/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch b/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.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/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 02b1976..406de05 100644
--- a/package/multimedia/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -3,12 +3,13 @@
# libogg
#
#############################################################
-LIBOGG_VERSION = 1.1.4
+LIBOGG_VERSION = 1.2.0
LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
LIBOGG_AUTORECONF = NO
LIBOGG_INSTALL_STAGING = YES
LIBOGG_INSTALL_TARGET = YES
+LIBOGG_LIBTOOL_PATCH = no
LIBOGG_DEPENDENCIES = host-pkg-config
--
1.7.2.3
next prev parent reply other threads:[~2010-09-19 2:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-19 2:53 [Buildroot] [PATCH 00/21] Resend package updates patch set Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 02/21] alsa-utils: " Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 03/21] autoconf: bump to 2.67 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 04/21] automake: bump to 1.11.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 05/21] bison: bump to 2.4.3 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 06/21] ccache: bump to 3.0.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 07/21] fakeroot: bump to 1.14.4 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1 Martin Banky
2010-10-06 11:39 ` Peter Korsgaard
2010-09-19 2:53 ` [Buildroot] [PATCH 09/21] gmp: bump to 5.0.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 10/21] libdeamon: bump to 0.14 Martin Banky
2010-09-19 2:53 ` Martin Banky [this message]
2010-11-05 17:00 ` [Buildroot] [PATCH 12/21] libogg: bump to 1.2.0 Thomas Petazzoni
2010-09-19 2:53 ` [Buildroot] [PATCH 13/21] libvorbis: bump to 1.3.1 Martin Banky
2010-11-05 17:01 ` Thomas Petazzoni
2010-09-19 2:53 ` [Buildroot] [PATCH 14/21] make: bump to 3.82 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 15/21] module-init-tools: bump to 3.12 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 16/21] mpfr: bump to 3.0.0 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 17/21] nano: bump to 2.2.5 Martin Banky
2010-10-06 11:34 ` Peter Korsgaard
2010-09-19 2:53 ` [Buildroot] [PATCH 18/21] ntp: convert to autotargets and bump to 4.2.6p2 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 19/21] openssl: bump to 1.0.0a Martin Banky
2010-09-19 10:05 ` Marcus Osdoba
2010-09-19 16:51 ` Martin Banky
2010-09-21 23:04 ` Martin Banky
2010-10-08 19:43 ` Marcus Osdoba
2010-09-19 2:53 ` [Buildroot] [PATCH 20/21] BugFix - Bison - Fixed Missing stddef.h Include In wchar.h Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 21/21] BugFix - m4 - Fixed Missing wint_t typedef When There Is No WChar Support Martin Banky
2010-09-19 9:58 ` Marcus Osdoba
2010-09-19 17:05 ` Martin Banky
2010-09-19 2:55 ` [Buildroot] [PATCH 11/21] libelf: bump to 0.8.13 Martin Banky
2010-11-05 16:13 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2010-09-14 3:40 [Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23 Martin Banky
2010-09-14 3:40 ` [Buildroot] [PATCH 12/21] libogg: bump to 1.2.0 Martin Banky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284864823-18993-13-git-send-email-Martin.Banky@gmail.com \
--to=martin.banky@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox