8f20bd9e6e
ftp://ftp.berlios.de/pub/cdrecord/alpha/AN-3.01a23
Note that some versions were skipped as they made no net difference for
FreeBSD.
- Account for the fact that libiconv now may live in base.
- Base LDPATH on ${LOCALBASE} rather than ${PREFIX}.
- Add staging support based on r347876.
Approved by: beat (mentor, implicit)
84 lines
2.9 KiB
Text
84 lines
2.9 KiB
Text
###########################################################################
|
|
# This patch was contributed by Marius Strobl.
|
|
###########################################################################
|
|
# The contents of this file are subject to the terms of the
|
|
# Common Development and Distribution License, Version 1.0 only
|
|
# (the "License"). You may not use this file except in compliance
|
|
# with the License.
|
|
#
|
|
# See the file CDDL.Schily.txt in this distribution for details.
|
|
#
|
|
# When distributing Covered Code, include this CDDL HEADER in each
|
|
# file and include the License file CDDL.Schily.txt from this distribution.
|
|
###########################################################################
|
|
# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
|
|
# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
|
|
###########################################################################
|
|
|
|
--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006
|
|
+++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006
|
|
@@ -22,8 +22,9 @@
|
|
###########################################################################
|
|
|
|
CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX)
|
|
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
|
|
-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
|
|
+XCFLAGS:= $(CFLAGS)
|
|
+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
|
|
+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX)
|
|
|
|
CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%)
|
|
COPTS=
|
|
@@ -31,12 +32,10 @@
|
|
CWOPTS= -Wall -Wtraditional
|
|
CWOPTS= -Wall -Wno-unknown-pragmas \
|
|
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
|
|
-COPTOPT= -O
|
|
COPTDYN= -fpic
|
|
COPTGPROF= -pg
|
|
C++OPTS=
|
|
C++WOPTS= $(CWOPTS)
|
|
-C++OPTOPT= $(COPTOPT)
|
|
C++OPTDYN= -fpic
|
|
C++OPTGPROF= -pg
|
|
|
|
@@ -56,28 +55,18 @@
|
|
|
|
FLOAT_OPTIONS=
|
|
|
|
-__CC_COM= $(_UNIQ)$(CC)
|
|
-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF))
|
|
-CC_COM= $(___CC_COM:$(_UNIQ)%=%)
|
|
-
|
|
-__CC++_COM= $(_UNIQ)$(CCC)
|
|
-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF))
|
|
-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%)
|
|
-
|
|
-CC_COM_DEF= gcc
|
|
-CC++_COM_DEF= g++
|
|
-CC= $(CC_COM_DEF)
|
|
-CCC= $(CC++_COM_DEF)
|
|
-
|
|
-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM)
|
|
-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM)
|
|
-LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM)
|
|
-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM)
|
|
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM)
|
|
-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM)
|
|
+CC_COM= $(CC)
|
|
+CC++_COM= $(CXX)
|
|
+
|
|
+CCCC = $(CC_COM)
|
|
+CC++ = $(CC++_COM)
|
|
+LDCC= $(CC_COM)
|
|
+LDCC++ = $(CC++_COM)
|
|
+DYNLD= $(CC_COM)
|
|
+DYNLDC++ = $(CC++_COM)
|
|
|
|
RMDEP= :
|
|
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M
|
|
+MKDEP= $(CC_COM) -M
|
|
MKDEP_OUT=
|
|
-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M
|
|
+MKC++DEP= $(CC++_COM) -M
|
|
MKC++DEP_OUT=
|