summaryrefslogtreecommitdiff
path: root/databases/mysql322-server/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql322-server/files')
-rw-r--r--databases/mysql322-server/files/patch-ac13
-rw-r--r--databases/mysql322-server/files/patch-an15
-rw-r--r--databases/mysql322-server/files/patch-ap18
-rw-r--r--databases/mysql322-server/files/patch-aq13
-rw-r--r--databases/mysql322-server/files/patch-ar14
5 files changed, 45 insertions, 28 deletions
diff --git a/databases/mysql322-server/files/patch-ac b/databases/mysql322-server/files/patch-ac
index 6cbb8431c9cd..c703a5e1b8c6 100644
--- a/databases/mysql322-server/files/patch-ac
+++ b/databases/mysql322-server/files/patch-ac
@@ -1,5 +1,5 @@
---- mit-pthreads/config/configure.orig Tue Mar 10 10:11:25 1998
-+++ mit-pthreads/config/configure Thu Feb 4 23:02:41 1999
+--- mit-pthreads/config/configure.orig Fri Dec 31 01:15:51 1999
++++ mit-pthreads/config/configure Mon Jan 3 16:52:59 2000
@@ -692,10 +692,6 @@
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
@@ -11,12 +11,3 @@
fi
else
GCC=
-@@ -1280,7 +1276,7 @@
- m68*-*-netbsd*)
- name=m68000-netbsd
- ;;
-- i386-*-freebsd2.*)
-+ i386-*-freebsd*)
- name=i386-freebsd-2.0
- sysincludes=freebsd-2.0
- except="fork lseek ftruncate sigsuspend sigprocmask"
diff --git a/databases/mysql322-server/files/patch-an b/databases/mysql322-server/files/patch-an
index ca3680549992..00190736f765 100644
--- a/databases/mysql322-server/files/patch-an
+++ b/databases/mysql322-server/files/patch-an
@@ -1,16 +1,15 @@
---- Makefile.in.orig Sun Jun 6 04:51:50 1999
-+++ Makefile.in Sat Jun 26 08:53:51 1999
-@@ -141,8 +141,11 @@
+--- Makefile.in.orig Sat Jan 1 17:59:38 2000
++++ Makefile.in Mon Jan 3 17:19:23 2000
+@@ -144,7 +144,11 @@
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS
--SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts include tests man @bench_dirs@ support-files
--
+-SUBDIRS = include @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts tests man @bench_dirs@ support-files
+.if defined(CLIENT_ONLY)
-+SUBDIRS = @readline_dir@ client include tests man
++SUBDIRS = include @readline_dir@ client tests man
+.else
-+SUBDIRS = @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
++SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
+.endif
+
# Relink after clean
- CLEANFILES = linked_client_sources
diff --git a/databases/mysql322-server/files/patch-ap b/databases/mysql322-server/files/patch-ap
index f42968f78ee6..097b449a181a 100644
--- a/databases/mysql322-server/files/patch-ap
+++ b/databases/mysql322-server/files/patch-ap
@@ -1,11 +1,11 @@
---- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999
-+++ strings/Makefile.in Sun Sep 12 23:56:25 1999
-@@ -143,7 +143,7 @@
+--- strings/Makefile.in.orig Sat Jan 1 18:00:30 2000
++++ strings/Makefile.in Mon Jan 3 17:21:19 2000
+@@ -145,7 +145,7 @@
+ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
pkglib_LIBRARIES = libmystrings.a
+ #no assembler
+-@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.s longlong2str-x86.s
++@ASSEMBLER_x86_TRUE@ASRCS = strings-x86.S longlong2str-x86.S
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_TRUE@ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
+ @ASSEMBLER_x86_FALSE@@ASSEMBLER_sparc_FALSE@ASRCS =
# These file MUST all be on the same line!! Otherwise automake
- # generats a very broken makefile
--@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s
-+@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S
- @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c
-
- libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS)
diff --git a/databases/mysql322-server/files/patch-aq b/databases/mysql322-server/files/patch-aq
new file mode 100644
index 000000000000..573324175921
--- /dev/null
+++ b/databases/mysql322-server/files/patch-aq
@@ -0,0 +1,13 @@
+--- sql/Makefile.in.orig Sat Jan 1 18:01:13 2000
++++ sql/Makefile.in Wed Jan 5 20:28:17 2000
+@@ -317,6 +317,10 @@
+ else :; fi
+ sql_yacc.hh: sql_yacc.cc
+
++# gcc takes a lot of memory and cpu time if it compiles sql_yacc.cc with -O
++sql_yacc.o: sql_yacc.cc
++ $(CXXCOMPILE) -O0 -c $<
++
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
diff --git a/databases/mysql322-server/files/patch-ar b/databases/mysql322-server/files/patch-ar
new file mode 100644
index 000000000000..ed7654838e66
--- /dev/null
+++ b/databases/mysql322-server/files/patch-ar
@@ -0,0 +1,14 @@
+--- include/Makefile.in.orig Sat Jan 1 17:59:41 2000
++++ include/Makefile.in Wed Jan 5 21:04:23 2000
+@@ -259,7 +259,11 @@
+
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++.if defined(CLIENT_ONLY)
+ install: install-am
++.else
++install:
++.endif
+ uninstall-am: uninstall-pkgincludeHEADERS
+ uninstall: uninstall-am
+ all-am: Makefile $(HEADERS) all-local