From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 16 15:00:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5F7A106564A for ; Tue, 16 Mar 2010 15:00:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9234B8FC1D for ; Tue, 16 Mar 2010 15:00:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2GF04c3095090 for ; Tue, 16 Mar 2010 15:00:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2GF04fB095089; Tue, 16 Mar 2010 15:00:04 GMT (envelope-from gnats) Resent-Date: Tue, 16 Mar 2010 15:00:04 GMT Resent-Message-Id: <201003161500.o2GF04fB095089@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrius Morkunas Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EAF7106566B for ; Tue, 16 Mar 2010 14:54:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id F28238FC20 for ; Tue, 16 Mar 2010 14:54:09 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2GEs9Os034417 for ; Tue, 16 Mar 2010 14:54:09 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2GEs9P0034410; Tue, 16 Mar 2010 14:54:09 GMT (envelope-from nobody) Message-Id: <201003161454.o2GEs9P0034410@www.freebsd.org> Date: Tue, 16 Mar 2010 14:54:09 GMT From: Andrius Morkunas To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/144791: [patch] databases/mysql40-server fix build with gcc42 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2010 15:00:04 -0000 >Number: 144791 >Category: ports >Synopsis: [patch] databases/mysql40-server fix build with gcc42 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 16 15:00:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andrius Morkunas >Release: >Organization: >Environment: >Description: Get rid of USE_GCC=3.4 >How-To-Repeat: >Fix: The patch prevents gcc from using min/max operators. http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_6.html#SEC116 Patch attached with submission follows: 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 >Release-Note: >Audit-Trail: >Unformatted: