svn commit: r374588 - branches/2014Q4/graphics/exact-image/files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Dec 12 11:33:42 2014
New Revision: 374588
URL: https://svnweb.freebsd.org/changeset/ports/374588
QAT: https://qat.redports.org/buildarchive/r374588/

Log:
  MFH: r374558
  
  - Unbreak on amd64 by respecting C*FLAGS
  
  Approved by:	portmgr blanket
  Approved by:	ports-secteam (rea)

Added:
  branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make
     - copied unchanged from r374558, head/graphics/exact-image/files/patch-build__bottom.make
Modified:
Directory Properties:
  branches/2014Q4/   (props changed)

Copied: branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make (from r374558, head/graphics/exact-image/files/patch-build__bottom.make)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make	Fri Dec 12 11:33:42 2014	(r374588, copy of r374558, head/graphics/exact-image/files/patch-build__bottom.make)
@@ -0,0 +1,31 @@
+--- build/bottom.make.orig	2010-07-22 18:35:17.000000000 +0400
++++ build/bottom.make	2014-12-12 00:07:13.000000000 +0300
+@@ -43,23 +43,23 @@
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.c
+ 	@echo '  C         $@'
+-	$(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.m
+ 	@echo '  ObjC      $@'
+-	$(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $($(X_MODULE)_OUTPUT)/%.cc
+ 	@echo '  C++       $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.cc
+ 	@echo '  C++       $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.mm
+ 	@echo '  ObjC++    $@'
+-	$(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
++	$(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<'
+ 
+ # only implicit rules if one binary per module ...
+ ifeq ($(words $(BINARY)), 1)