Author: ken
Date: 2009-01-21 15:39:53 -0700 (Wed, 21 Jan 2009)
New Revision: 2037
Added:
trunk/gstreamer/gstreamer-0.10.21-bison_2.4.1_build_fix-1.patch
Removed:
trunk/gstreamer/gstreamer-0.10.21-build_fixes-2.patch
Log:
The gtkdoc-rebase part of the build fix is better handled by the less-invasive
sed now in BLFS, which means the patch for people using bison-2.4.1 can be
separated out.
Added: trunk/gstreamer/gstreamer-0.10.21-bison_2.4.1_build_fix-1.patch
===================================================================
--- trunk/gstreamer/gstreamer-0.10.21-bison_2.4.1_build_fix-1.patch
(rev 0)
+++ trunk/gstreamer/gstreamer-0.10.21-bison_2.4.1_build_fix-1.patch
2009-01-21 22:39:53 UTC (rev 2037)
@@ -0,0 +1,23 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2009-01021
+Initial Package Version: 0.10.21
+Upstream Status: Unknown, but it looks like it has been backported from
upstream
+Origin: Unknown, found in gentoo and fedora, edited to apply with -p1.
+Description: Allows gstreamer's configure to note choke on bison version 2.4.1
+> checking bison version 2.4.1 >= 1.875... Argument "^B^D^A" isn't numeric in
numeric lt (<) at - line 1.
+- run 'autoreconf && libtoolize -f' after applying this, in a clean tree.
+
+--- foobar/common/m4/gst-parser.m4 2008/07/20 19:55:14 1.12
++++ foobar/common/m4/gst-parser.m4 2008/12/15 07:06:26 1.13
+@@ -15,10 +15,7 @@
+ bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^[[^0-9]]*//' |
sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
+ AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
+
+- if perl -w <<EOF
+- exit ($bison_version < $bison_min_version) ? 0 : 1;
+-EOF
+- then
++ if perl -we "exit ((v$bison_version ge v$bison_min_version) ? 0 : 1)"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([no])
Deleted: trunk/gstreamer/gstreamer-0.10.21-build_fixes-2.patch
===================================================================
--- trunk/gstreamer/gstreamer-0.10.21-build_fixes-2.patch 2009-01-07
23:24:09 UTC (rev 2036)
+++ trunk/gstreamer/gstreamer-0.10.21-build_fixes-2.patch 2009-01-21
22:39:53 UTC (rev 2037)
@@ -1,61 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2009-01-07
-Initial Package Version: 0.10.21
-Upstream Status: unknown
-Origin: (1.) self (2.) unknown, found in fedora and gentoo
-Description: Consolidated build fixes.
-1. allows 'make install' to succeed if gtkdoc-rebase is not present.
-2. stop configure barfing with bison-2.4.1
-Run autoreconf and libtoolize -f after applying this (very noisy).
-
-diff -Naur gstreamer-0.10.21.orig/common/gtk-doc.mak
gstreamer-0.10.21/common/gtk-doc.mak
---- gstreamer-0.10.21.orig/common/gtk-doc.mak 2008-09-10 10:13:16.000000000
+0100
-+++ gstreamer-0.10.21/common/gtk-doc.mak 2009-01-07 20:02:47.000000000
+0000
-@@ -201,7 +201,7 @@
-
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-...@[email protected]; \
- fi; \
- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
- fi)
- uninstall-local:
- (installfiles=`echo ./html/*.html`; \
-diff -Naur gstreamer-0.10.21.orig/common/m4/gst-parser.m4
gstreamer-0.10.21/common/m4/gst-parser.m4
---- gstreamer-0.10.21.orig/common/m4/gst-parser.m4 2008-09-10
10:16:47.000000000 +0100
-+++ gstreamer-0.10.21/common/m4/gst-parser.m4 2009-01-07 20:02:56.000000000
+0000
-@@ -15,10 +15,7 @@
- bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^[[^0-9]]*//' |
sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
- AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
-
-- if perl -w <<EOF
-- exit ($bison_version < $bison_min_version) ? 0 : 1;
--EOF
-- then
-+ if perl -we "exit ((v$bison_version ge v$bison_min_version) ? 0 : 1)"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no])
-diff -Naur gstreamer-0.10.21.orig/docs/gst/Makefile.in
gstreamer-0.10.21/docs/gst/Makefile.in
---- gstreamer-0.10.21.orig/docs/gst/Makefile.in 2008-10-02
22:54:18.000000000 +0100
-+++ gstreamer-0.10.21/docs/gst/Makefile.in 2009-01-07 20:02:47.000000000
+0000
-@@ -809,7 +809,7 @@
-
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-...@[email protected]; \
- fi; \
- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
- fi)
- uninstall-local:
- (installfiles=`echo ./html/*.html`; \
-diff -Naur gstreamer-0.10.21.orig/docs/libs/Makefile.in
gstreamer-0.10.21/docs/libs/Makefile.in
---- gstreamer-0.10.21.orig/docs/libs/Makefile.in 2008-10-02
22:54:18.000000000 +0100
-+++ gstreamer-0.10.21/docs/libs/Makefile.in 2009-01-07 20:02:47.000000000
+0000
-@@ -811,7 +811,7 @@
-
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-...@[email protected]; \
- fi; \
- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
- fi)
- uninstall-local:
- (installfiles=`echo ./html/*.html`; \
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
