diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-12-12 11:33:42 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-12-12 11:33:42 +0000 |
| commit | bc0dc7b18ea8b9b323390451b225b6f524963a12 (patch) | |
| tree | fc1053d1eb8403376c7ecd3e625f635628ee5e3e | |
| parent | 55411519b53b40dd381b47e2223fa026fc4d1974 (diff) | |
| download | ports-bc0dc7b18ea8b9b323390451b225b6f524963a12.tar.gz ports-bc0dc7b18ea8b9b323390451b225b6f524963a12.zip | |
MFH: r374558
- Unbreak on amd64 by respecting C*FLAGS
Approved by: portmgr blanket
Approved by: ports-secteam (rea)
Notes
Notes:
svn path=/branches/2014Q4/; revision=374588
| -rw-r--r-- | graphics/exact-image/files/patch-build__bottom.make | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/graphics/exact-image/files/patch-build__bottom.make b/graphics/exact-image/files/patch-build__bottom.make new file mode 100644 index 000000000000..9f3371c52090 --- /dev/null +++ b/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) |