- disable dynamic linking with libphobos by default (causes symbol clashes between...

[packages/dmd.git] / dmd-system-zlib.patch

diff --git a/dmd-system-zlib.patch b/dmd-system-zlib.patch
index 273d69dfdf4a1b2ff43875917392775815d2457e..a0aca4f158a2b319fd3333b1262ea34ce3226a6d 100644 (file)
--- a/dmd-system-zlib.patch
+++ b/dmd-system-zlib.patch
@@ -29,3 +29,14 @@
  
  dll : $(ROOT)/libphobos2.so
  
+--- dmd2/tools/posix.mak.orig  2014-02-13 16:09:46.000000000 +0100
++++ dmd2/tools/posix.mak       2014-03-22 10:01:55.092212006 +0100
+@@ -102,7 +102,7 @@
+ #dreadful custom step because of libcurl dmd linking problem (Bugzilla 7044)
+ $(CURL_TOOLS): $(ROOT)/%: %.d
+       $(DMD) -c -of$(@).o $(<)
+-      ($(DMD) -v -of$(@) $(@).o 2>/dev/null | grep '\-Xlinker' | cut -f2- -d' ' ; echo -lcurl  ) | xargs $(CC)
++      ($(DMD) -v -of$(@) $(@).o 2>/dev/null | grep '\-Xlinker' | cut -f2- -d' ' ; echo -lcurl -lz) | xargs $(CC)
+ 
+ $(TOOLS) $(DOC_TOOLS): $(ROOT)/%: %.d
+       $(DMD) $(MODEL_FLAG) $(DFLAGS) -of$(@) $(<)