Attachment 36402 Details for Bug 58377 – mysql40-server.diff

[patch] mysql40-server.diff

mysql40-server.diff (text/plain), 4.79 KB, created by Alex Dupre on 2003-10-22 15:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2003-10-22 15:20:17 UTC

Size: 4.79 KB

patch

obsolete

>diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
>--- mysql40-server.orig/Makefile	Wed Oct 22 10:24:47 2003
>+++ mysql40-server/Makefile	Wed Oct 22 15:34:20 2003
>@@ -6,12 +6,10 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	4.0.15
>+PORTVERSION=	4.0.16
> PORTREVISION?=	0
> CATEGORIES=	databases
>-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
>-		http://mysql.tzone.it/Downloads/MySQL-4.0/ \
>-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
>+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
> 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
> 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
> 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \
>@@ -50,11 +48,6 @@
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${MACHINE_ARCH} == "i386"
>-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
>-.endif
> .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
> CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
> .endif
>@@ -68,8 +61,11 @@
> .if defined(BUILD_STATIC)
> CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
> .endif
>-.if defined(BUILD_OPTIMIZED)
>-CFLAGS+=	-mcpu=i686
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${MACHINE_ARCH} == "i386"
>+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
> .endif
> .if defined(WITH_LINUXTHREADS)
> CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
>@@ -85,14 +81,18 @@
> .endif
> .endif
> 
>+.if ${OSVERSION} < 500000
>+CXX=		${CC}
>+.endif
>+.if defined(BUILD_OPTIMIZED)
> CFLAGS+=	-O3 -fno-omit-frame-pointer
>-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
>-
>+.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3))
>+CFLAGS+=	-fno-gcse
>+.endif
>+CXXFLAGS+=	${CFLAGS} -felide-constructors -fno-rtti
> .if ${OSVERSION} >= 400002
> CXXFLAGS+=	-fno-exceptions
> .endif
>-.if ${OSVERSION} < 500000
>-CXX=		${CC}
> .endif
> 
> # MySQL-Server part
>@@ -122,9 +122,11 @@
> 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
> 	@${ECHO} "				reverse lookup  before inserting local"
> 	@${ECHO} "				hostname into mysql database"
>-	@${ECHO} "				(use if your machine has no official DNS entry)."
>+	@${ECHO} "				(use it if your machine has no official DNS entry)."
>+	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
>+	@${ECHO} "				(use it if you need speed)."
> 	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
>-	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
>+	@${ECHO} "				(use it if you need even more speed)."
> 	@${ECHO} ""
> 
> post-patch:
>diff -ruN mysql40-server.orig/distinfo mysql40-server/distinfo
>--- mysql40-server.orig/distinfo	Wed Oct 22 10:24:47 2003
>+++ mysql40-server/distinfo	Wed Oct 22 14:25:41 2003
>@@ -1 +1 @@
>-MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d
>+MD5 (mysql-4.0.16.tar.gz) = ddc959b9cdc2f5e30dc6a4d3650d3db5
>diff -ruN mysql40-server.orig/files/patch-configure mysql40-server/files/patch-configure
>--- mysql40-server.orig/files/patch-configure	Wed Oct 22 10:24:47 2003
>+++ mysql40-server/files/patch-configure	Wed Oct 22 15:13:20 2003
>@@ -1,6 +1,6 @@
>---- configure.orig	Wed May 14 22:24:53 2003
>-+++ configure	Fri May 23 00:29:06 2003
>-@@ -8110,6 +8110,7 @@
>+--- configure.orig	Fri Oct 17 07:29:41 2003
>++++ configure	Wed Oct 22 15:12:52 2003
>+@@ -8116,6 +8116,7 @@
>  
>  # This can be used to rebuild libtool when needed
>  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>@@ -8,7 +8,7 @@
>  
>  # Always use our own libtool.
>  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>-@@ -9052,7 +9053,7 @@
>+@@ -9058,7 +9059,7 @@
>    ;;
>  esac
>  fi
>@@ -17,7 +17,7 @@
>  
>  if test -n "$HOSTNAME"; then
>    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
>-@@ -9244,43 +9245,8 @@
>+@@ -9250,43 +9251,8 @@
>  echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
>  echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
>  PS=$ac_cv_path_PS
>@@ -61,7 +61,18 @@
>  
>  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
>  echo "${ECHO_T}\"$FIND_PROC\"" >&6
>-@@ -22320,7 +22294,7 @@
>+@@ -12667,8 +12633,8 @@
>+ # Some system specific hacks
>+ #
>+ 
>+-MAX_C_OPTIMIZE="-O3"
>+-MAX_CXX_OPTIMIZE="-O3"
>++MAX_C_OPTIMIZE=""
>++MAX_CXX_OPTIMIZE=""
>+ 
>+ case $SYSTEM_TYPE in
>+   *solaris2.7*)
>+@@ -22458,7 +22424,7 @@
>  	/* ) rel_srcdir="$srcdir" ;;
>  	* )  rel_srcdir="../$srcdir" ;;
>      esac
>diff -ruN mysql40-server.orig/pkg-plist mysql40-server/pkg-plist
>--- mysql40-server.orig/pkg-plist	Wed Oct 22 10:24:47 2003
>+++ mysql40-server/pkg-plist	Wed Oct 22 16:07:42 2003
>@@ -102,6 +102,7 @@
> share/mysql/MySQL-shared-compat.spec
> share/mysql/StartupParameters.plist
> share/mysql/binary-configure
>+share/mysql/make_sharedlib_distribution
> share/mysql/postinstall
> share/mysql/preinstall
> share/mysql/charsets/Index

Actions: View | Diff

Attachments on bug 58377: 36402