r2240 - trunk/mysql

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Nov 12 10:12:42 PST 2010


Author: randy
Date: 2010-11-12 11:12:35 -0700 (Fri, 12 Nov 2010)
New Revision: 2240

Added:
   trunk/mysql/mysql-5.1.52-makefile-1.patch
Log:
Added MySQL patch

Added: trunk/mysql/mysql-5.1.52-makefile-1.patch
===================================================================
--- trunk/mysql/mysql-5.1.52-makefile-1.patch	                        (rev 0)
+++ trunk/mysql/mysql-5.1.52-makefile-1.patch	2010-11-12 18:12:35 UTC (rev 2240)
@@ -0,0 +1,54 @@
+Submitted By: Bruce dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2010-07-31
+Initial Package Version: 5.1.49
+Upstream Status: Unknown
+Origin: mysql mailing list; rediffed by Randy McMurchy for 5.1.52
+Description: Removes bogus do_abi_check.
+
+diff -Naur mysql-5.1.52/Makefile.in mysql.patched/Makefile.in
+--- mysql-5.1.52/Makefile.in	2010-10-11 20:40:55.000000000 +0000
++++ mysql.patched/Makefile.in	2010-11-12 12:23:00.000000000 +0000
+@@ -1136,24 +1136,25 @@
+ 	$(MAKE) abi_headers="$^" do_abi_check
+ 
+ do_abi_check:
+-	set -ex; \
+-	for file in $(abi_headers); do \
+-	         @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
+-	                  -I$(top_srcdir)/include \
+-	                  -I$(top_srcdir)/include/mysql \
+-	                  -I$(top_srcdir)/sql \
+-	                  -I$(top_builddir)/include \
+-	                  -I$(top_builddir)/include/mysql \
+-	                  -I$(top_builddir)/sql \
+-	                                 $$file 2>/dev/null | \
+-	                  @SED@ -e '/^# /d' \
+-	                            -e '/^[ 	]*$$/d' \
+-	                            -e '/^#pragma GCC set_debug_pwd/d' \
+-	                            -e '/^#ident/d' > \
+-	                                       $(top_builddir)/abi_check.out; \
+-	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
+-	                  @RM@ $(top_builddir)/abi_check.out; \
+-	done
++#	set -ex; \
++#	for file in $(abi_headers); do \
++#	         @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
++#	                  -I$(top_srcdir)/include \
++#	                  -I$(top_srcdir)/include/mysql \
++#	                  -I$(top_srcdir)/sql \
++#	                  -I$(top_builddir)/include \
++#	                  -I$(top_builddir)/include/mysql \
++#	                  -I$(top_builddir)/sql \
++#	                                 $$file 2>/dev/null | \
++#	                  @SED@ -e '/^# /d' \
++#	                            -e '/^[ 	]*$$/d' \
++#	                            -e '/^#pragma GCC set_debug_pwd/d' \
++#	                            -e '/^#ident/d' > \
++#	                                       $(top_builddir)/abi_check.out; \
++#	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
++#	                  @RM@ $(top_builddir)/abi_check.out; \
++#	done
++	echo "Skipping do_abi_check"
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%




More information about the patches mailing list