Attachment 104586 Details for Bug 144791 – file.diff

[patch] file.diff

file.diff (text/plain), 1.07 KB, created by Andrius Morkunas on 2010-03-16 15:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrius Morkunas

Created: 2010-03-16 15:00:04 UTC

Size: 1.07 KB

patch

obsolete

>diff -ruN databases/mysql40-server.orig/Makefile databases/mysql40-server/Makefile
>--- databases/mysql40-server.orig/Makefile	2010-01-11 11:58:38.000000000 +0000
>+++ databases/mysql40-server/Makefile	2010-03-16 14:39:25.512368548 +0000
>@@ -71,9 +71,6 @@
> CFLAGS+=	${PTHREAD_CFLAGS}
> .endif
> 
>-.if ${OSVERSION} >= 700000
>-USE_GCC=	3.4
>-.endif
> .if defined(BUILD_OPTIMIZED)
> CFLAGS+=	-O3 -fno-omit-frame-pointer -fno-gcse
> .endif
>@@ -121,6 +118,8 @@
> .if defined(WITH_PROC_SCOPE_PTH)
> 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/libmysqld/lib_sql.cc ${WRKSRC}/sql/mysqld.cc
> .endif
>+	@${REINPLACE_CMD} -e 's|\&\& defined(__GNUC__)|\&\& defined(__GNUC__) \&\& 0|' \
>+		${WRKSRC}/include/my_global.h
> 
> post-install:
> .if !defined(PACKAGE_BUILDING)
>@@ -148,6 +147,8 @@
> .if defined(WITH_PROC_SCOPE_PTH)
> 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
> .endif
>+	@${REINPLACE_CMD} -e 's|\&\& defined(__GNUC__)|\&\& defined(__GNUC__) \&\& 0|' \
>+		${WRKSRC}/include/my_global.h
> 
> .else
> # MySQL-Scripts part

Actions: View | Diff

Attachments on bug 144791: 104586