From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 6 06:50:20 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D14CB16A4B3 for ; Mon, 6 Oct 2003 06:50:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFE0A43FBD for ; Mon, 6 Oct 2003 06:50:19 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h96DoIFY026137 for ; Mon, 6 Oct 2003 06:50:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h96DoIPx026136; Mon, 6 Oct 2003 06:50:18 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 6 Oct 2003 06:50:18 -0700 (PDT) Resent-Message-Id: <200310061350.h96DoIPx026136@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, Jens Rehsack Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D47316A4C0 for ; Mon, 6 Oct 2003 06:43:31 -0700 (PDT) Received: from helo.liwing.de (helo.liwing.de [213.70.188.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9CE243FB1 for ; Mon, 6 Oct 2003 06:43:29 -0700 (PDT) (envelope-from root@helo.liwing.de) Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1]) by helo.liwing.de (8.12.9p2/8.12.9) with ESMTP id h96DhRUn036121; Mon, 6 Oct 2003 13:43:27 GMT (envelope-from root@helo.liwing.de) Received: (from root@localhost) by helo.liwing.de (8.12.9p2/8.12.9/Submit) id h96DhOTl036120; Mon, 6 Oct 2003 13:43:24 GMT (envelope-from root) Message-Id: <200310061343.h96DhOTl036120@helo.liwing.de> Date: Mon, 6 Oct 2003 13:43:24 GMT From: Jens Rehsack To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: sysadmin@alexdupre.com Subject: ports/57644: [PATCH] changing CFLAGS and CPUTYPE respection of databases/mysql40-server X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jens Rehsack List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Oct 2003 13:50:21 -0000 >Number: 57644 >Category: ports >Synopsis: [PATCH] changing CFLAGS and CPUTYPE respection of databases/mysql40-server >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 06 06:50:18 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Jens Rehsack >Release: FreeBSD 5.1-CURRENT i386 >Organization: LiWing IT-Services >Environment: System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Oct 3 22:18:43 GMT 2003 root@statler:/usr/obj/usr/src/sys/STATLER i386 >Description: This patch corrects 3 (IMHO) little issues of databases/mysql40-server 1) "-O3 ..." is added to CFLAGS only when optimized build is wished The machine admin may have reasons for wanting lower optimization. 2) If gcc3 < 3.4 is used on x86 architecture, gcse is disabled because of bugs in gcc3 < 3.4 3) -mcpu in CFLAGS is changed into CPUTYPE?=, because the admin may have it's CPUTYPE already defined in /etc/make.conf (etc.) and the -mcpu flag to gcc is included in -march= which is generated by bsd.cpu.mk (/usr/share/mk/). Furthermore the admin may have the chance to avoid using of cpu based optimization by setting NO_CPU_CFLAGS in /etc/make.conf. >How-To-Repeat: >Fix: --- patch-optimized begins here --- Index: databases/mysql40-server/Makefile =================================================================== diff -u databases/mysql40-server/Makefile.orig databases/mysql40-server/Makefile --- databases/mysql40-server/Makefile.orig Mon Oct 6 13:11:15 2003 +++ databases/mysql40-server/Makefile Mon Oct 6 13:27:45 2003 @@ -52,6 +52,10 @@ .include +.if defined(BUILD_OPTIMIZED) +CFLAGS+= -O3 -fno-omit-frame-pointer +.endif + .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db .endif @@ -69,7 +73,10 @@ CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif .if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=i686 +CPUTYPE?= i686 +.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 .endif .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R @@ -85,7 +92,6 @@ .endif .endif -CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti .if ${OSVERSION} >= 400002 --- patch-optimized ends here --- >Release-Note: >Audit-Trail: >Unformatted: