mirror of
https://git.freebsd.org/ports.git
synced 2025-07-03 02:20:33 -04:00
d3716aacad
- re-add CONFLICTS for a couple of month to prevent user from installing the new devel/icu while they still have an old version of devel/icu2 or devel/icu4 [2] Submitted by: Ruslan Mahmatkhanov <cvs-src _at_ yandex.ru> (by mail) [1] and bsam@ (by mail) [2]
32 lines
855 B
Text
32 lines
855 B
Text
--- ./runConfigureICU.orig 2010-08-30 21:24:42.000000000 +0200
|
|
+++ ./runConfigureICU 2010-12-08 14:02:08.891252920 +0100
|
|
@@ -277,10 +277,10 @@
|
|
DEBUG_CXXFLAGS='-g -O0'
|
|
;;
|
|
*BSD)
|
|
- THE_OS="BSD"
|
|
- THE_COMP="the GNU C++"
|
|
- CC=gcc; export CC
|
|
- CXX=g++; export CXX
|
|
+ THE_OS="$platform"
|
|
+ CC=${CC:=cc}; export CC
|
|
+ CXX=${CXX:=c++}; export CXX
|
|
+ THE_COMP="`$CC -v | fgrep -i ver`"
|
|
DEBUG_CFLAGS='-g -O0'
|
|
DEBUG_CXFLAGS='-g -O0'
|
|
;;
|
|
@@ -327,14 +327,6 @@
|
|
|
|
if test $release -eq 1
|
|
then
|
|
- if test "$RELEASE_CFLAGS" = ""
|
|
- then
|
|
- case $CC in
|
|
- gcc|*/gcc|*-gcc-*|*/*-gcc-*)
|
|
- RELEASE_CFLAGS=-O3
|
|
- ;;
|
|
- esac
|
|
- fi
|
|
if test "$RELEASE_CFLAGS" != ""
|
|
then
|
|
CFLAGS="$CFLAGS $RELEASE_CFLAGS"
|