diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2014-03-24 00:55:05 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2014-03-24 00:55:05 +0000 |
| commit | 8f20bd9e6ebba7e6b95b9edcb80382538c84078a (patch) | |
| tree | 0b11c279fc8b4616cc35b772d1ff45df4fccd40f /sysutils/cdrtools-devel/files/patch-ad | |
| parent | - Stagify (diff) | |
- Update to 3.01a23. For release notes see:
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)
Notes
Notes:
svn path=/head/; revision=348916
Diffstat (limited to 'sysutils/cdrtools-devel/files/patch-ad')
| -rw-r--r-- | sysutils/cdrtools-devel/files/patch-ad | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/sysutils/cdrtools-devel/files/patch-ad b/sysutils/cdrtools-devel/files/patch-ad index a0ca40c6d9b0..a5caa1855562 100644 --- a/sysutils/cdrtools-devel/files/patch-ad +++ b/sysutils/cdrtools-devel/files/patch-ad @@ -17,19 +17,19 @@ --- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 +++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -20,8 +20,9 @@ +@@ -22,8 +22,9 @@ ########################################################################### - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) + 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%) $(OSDEFS) + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) COPTS= -@@ -29,12 +30,10 @@ +@@ -31,12 +32,10 @@ CWOPTS= -Wall -Wtraditional CWOPTS= -Wall -Wno-unknown-pragmas \ -Wshadow -Wmissing-prototypes -Wstrict-prototypes @@ -42,21 +42,33 @@ C++OPTDYN= -fpic C++OPTGPROF= -pg -@@ -54,18 +53,17 @@ +@@ -56,28 +55,18 @@ FLOAT_OPTIONS= --CC_COM= gcc --CC++_COM= g++ -+CC_COM= $(CC) -+CC++_COM= $(CXX) - --CC= @echo " ==> COMPILING \"$@\""; $(CC_COM) +-__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) |