summaryrefslogtreecommitdiff
path: root/poppler
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-11-13 09:59:10 +0200
committerTor Lillqvist <tml@iki.fi>2012-11-13 09:59:10 +0200
commit39f9eb0d856293a974e2f024b29dca20068af073 (patch)
tree4105478a11de9b0f36d3bc82b9cb79a0185fbcfe /poppler
parent0941c211858416f6117548e093b428b64785f98a (diff)
No -fno-check-new in Apple's Clang at least
Change-Id: I535fe7660460b7ceb66c4fb3f21449e2cceea7e1
Diffstat (limited to 'poppler')
-rw-r--r--poppler/UnpackedTarball_poppler.mk1
-rw-r--r--poppler/poppler-apple-clang.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/poppler/UnpackedTarball_poppler.mk b/poppler/UnpackedTarball_poppler.mk
index 65b5b5c68edf..aa5583e6d9a0 100644
--- a/poppler/UnpackedTarball_poppler.mk
+++ b/poppler/UnpackedTarball_poppler.mk
@@ -18,6 +18,7 @@ endif
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
poppler/poppler-ooopwd.patch \
+ $(if $(filter MACOSXxTRUE,$(OS)x$(COM_GCC_IS_CLANG)),poppler/poppler-apple-clang.patch) \
))
# vim: set noet sw=4 ts=4:
diff --git a/poppler/poppler-apple-clang.patch b/poppler/poppler-apple-clang.patch
new file mode 100644
index 000000000000..6ae7a6c271a0
--- /dev/null
+++ b/poppler/poppler-apple-clang.patch
@@ -0,0 +1,12 @@
+--- misc/poppler/configure
++++ misc/build/poppler/configure
+@@ -21162,7 +21162,7 @@
+ fi
+ case "$enable_compile_warnings" in
+ no) ;;
+- yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS" ;;
++ yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-common $CXXFLAGS" ;;
+ kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
+ -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
+ -Wconversion -Wall -W -Wpointer-arith \
+