View | Details | Raw Unified | Return to bug 150488
Collapse All | Expand All

(-)Makefile (+5 lines)
Lines 45-50 CONFIGURE_ARGS+=--with-charset=${WITH_CH Link Here
45 
.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
 45 
.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
46 
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 46 
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
47 
.endif
 47 
.endif
48 
.if defined(WITH_DTRACE)
49 
CONFIGURE_ARGS+=--enable-dtrace
50 
LDFLAGS+=-lelf
51 
.endif
48 
.if defined(WITH_OPENSSL)
 52 
.if defined(WITH_OPENSSL)
49 
.if !defined(WITHOUT_YASSL)
 53 
.if !defined(WITHOUT_YASSL)
50 
CONFIGURE_ARGS+=--with-ssl=bundled
 54 
CONFIGURE_ARGS+=--with-ssl=bundled
Lines 123-128 pre-fetch: Link Here
123 
	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
 127 
	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
124 
	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
 128 
	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
125 
	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
 129 
	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
130 
	@${ECHO} "	WITH_DTRACE=yes		Enable DTrace probes."
126 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
 131 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
127 
	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
 132 
	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
128 
	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
 133 
	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
(-)files/patch-configure.am (-2 / +11 lines)
Lines 1-5 Link Here
1 
--- configure.am.orig	2010-07-06 20:37:18.000000000 +0200
 1 
--- configure.am.orig	2010-07-06 19:37:18.000000000 +0100
2 
+++ configure.am	2010-07-16 11:11:48.000000000 +0200
 2 
+++ configure.am	2010-09-09 13:06:42.000000000 +0100
3 
@@ -990,6 +990,8 @@
 3 
@@ -990,6 +990,8 @@
4 
 MYSQL_BASE_VERSION
 4 
 MYSQL_BASE_VERSION
5 
 MYSQL_NO_DASH_VERSION
 5 
 MYSQL_NO_DASH_VERSION
Lines 9-14 Link Here
9 
 TEST_NDBCLUSTER
 9 
 TEST_NDBCLUSTER
10 
 MAKEINDEX
 10 
 MAKEINDEX
11 
 PDFLATEX
 11 
 PDFLATEX
12 
@@ -12651,7 +12653,7 @@
13 
 _ACEOF
14
15 
     case "$target_os" in
16 
-      *solaris*)
17 
+      *solaris*|*freebsd*)
18 
         HAVE_DTRACE_DASH_G="yes"
19 
         ;;
20 
       *)
12 
@@ -12684,6 +12686,8 @@
 21 
@@ -12684,6 +12686,8 @@
13 
 NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
 22 
 NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
14 
 NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
 23 
 NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
(-)Makefile (+5 lines)
Lines 45-50 CONFIGURE_ARGS+=--with-charset=${WITH_CH Link Here
45 
.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
 45 
.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
46 
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 46 
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
47 
.endif
 47 
.endif
48 
.if defined(WITH_DTRACE)
49 
CONFIGURE_ARGS+=--enable-dtrace
50 
LDFLAGS+=-lelf
51 
.endif
48 
.if defined(WITH_OPENSSL)
 52 
.if defined(WITH_OPENSSL)
49 
.if !defined(WITHOUT_YASSL)
 53 
.if !defined(WITHOUT_YASSL)
50 
CONFIGURE_ARGS+=--with-ssl=bundled
 54 
CONFIGURE_ARGS+=--with-ssl=bundled
Lines 123-128 pre-fetch: Link Here
123 
	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
 127 
	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
124 
	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
 128 
	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
125 
	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
 129 
	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
130 
	@${ECHO} "	WITH_DTRACE=yes		Enable DTrace probes."
126 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
 131 
	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
127 
	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
 132 
	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
128 
	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
 133 
	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
(-)files/patch-configure.am (-2 / +11 lines)
Lines 1-5 Link Here
1 
--- configure.am.orig	2010-07-06 20:37:18.000000000 +0200
 1 
--- configure.am.orig	2010-07-06 19:37:18.000000000 +0100
2 
+++ configure.am	2010-07-16 11:11:48.000000000 +0200
 2 
+++ configure.am	2010-09-09 13:06:42.000000000 +0100
3 
@@ -990,6 +990,8 @@
 3 
@@ -990,6 +990,8 @@
4 
 MYSQL_BASE_VERSION
 4 
 MYSQL_BASE_VERSION
5 
 MYSQL_NO_DASH_VERSION
 5 
 MYSQL_NO_DASH_VERSION
Lines 9-14 Link Here
9 
 TEST_NDBCLUSTER
 9 
 TEST_NDBCLUSTER
10 
 MAKEINDEX
 10 
 MAKEINDEX
11 
 PDFLATEX
 11 
 PDFLATEX
12 
@@ -12651,7 +12653,7 @@
13 
 _ACEOF
14
15 
     case "$target_os" in
16 
-      *solaris*)
17 
+      *solaris*|*freebsd*)
18 
         HAVE_DTRACE_DASH_G="yes"
19 
         ;;
20 
       *)
12 
@@ -12684,6 +12686,8 @@
 21 
@@ -12684,6 +12686,8 @@
13 
 NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
 22 
 NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
14 
 NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
 23 
 NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`

Return to bug 150488