- remove unnecessary mit-pthreads patches

- don't disable inlining
- add a workaround patch for GCC 2.95.x which compiles sql_yacc.cc with -O0
This commit is contained in:
brad 1999-12-02 03:41:01 +00:00
parent 782058784e
commit 028b8a7a0f
4 changed files with 10 additions and 64 deletions

View File

@ -1,22 +1,11 @@
--- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999
+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999
@@ -15,10 +15,6 @@
force=0
IN_RPM=0
--- sql/Makefile.in.orig Wed Dec 1 19:37:03 1999
+++ sql/Makefile.in Wed Dec 1 19:40:08 1999
@@ -1118,7 +1118,7 @@
# $(CXXCOMPILE) $(LM_CFLAGS) $< $(mysqld_LDADD)
-# Are we doing an rpm install?
-if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
-if test "$1" = "--force"; then force=1; shift; fi
-
# Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
if test -w /
then
@@ -60,8 +56,6 @@
fi
fi
sql_yacc.o: sql_yacc.cc sql_yacc.h
- $(CXXCOMPILE) $(LM_CFLAGS) -c $<
+ $(CXXCOMPILE) $(LM_CFLAGS) -O0 -c $<
-# On IRIX hostname is in /usr/bsd so add this to the path
-PATH=$PATH:/usr/bsd
hostname=`hostname` # Install this too in the user table
# Check if hostname is valid
lex_hash.h: lex.h
$(MAKE) gen_lex_hash

View File

@ -1,13 +0,0 @@
--- mit-pthreads/config/configure.orig Mon Jun 7 06:34:01 1999
+++ mit-pthreads/config/configure Wed Sep 15 15:25:29 1999
@@ -692,10 +692,6 @@
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-O2"
fi
else
GCC=

View File

@ -1,14 +1,5 @@
--- configure.orig Wed Apr 28 21:03:38 1999
+++ configure Tue May 11 16:47:14 1999
@@ -1780,7 +1780,7 @@
if test "$GXX" = "yes"
then
# mysqld requires this when compiled with gcc
- CXXFLAGS="$CXXFLAGS -fno-implicit-templates"
+ CXXFLAGS="$CXXFLAGS -fno-inline"
fi
# Avoid bug in fcntl on some versions of linux
+++ configure Wed Dec 1 19:22:50 1999
@@ -2199,30 +2199,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2201: checking "how to check if pid exists"" >&5

View File

@ -1,21 +0,0 @@
--- mit-pthreads/pthreads/Makefile.inc.orig Mon Mar 24 17:42:01 1997
+++ mit-pthreads/pthreads/Makefile.inc Sat Oct 10 16:32:05 1998
@@ -48,16 +48,10 @@
.endif
syscall.o: syscall.S
- cpp ${CPPFLAGS} ${.CURDIR}/syscall.S > syscall.i
- as syscall.i
- rm syscall.i
- mv a.out syscall.o
+ gcc -c -x assembler-with-cpp -o syscall.o ${.CURDIR}/syscall.S
syscall.po: syscall.S
- cpp ${CPPFLAGS} ${.CURDIR}/syscall.S > syscall.i
- as syscall.i
- rm syscall.i
- mv a.out syscall.po
+ gcc -c -x assembler-with-cpp -o syscall.po ${.CURDIR}/syscall.S
MAN2+=