- up to 2.072.0

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

diff --git a/dmd-system-zlib.patch b/dmd-system-zlib.patch
index a0aca4f158a2b319fd3333b1262ea34ce3226a6d..a0a6e6956793abcbfd51b7ca3cbb75025be97738 100644 (file)
--- a/dmd-system-zlib.patch
+++ b/dmd-system-zlib.patch
@@ -1,6 +1,6 @@
---- dmd2/src/phobos/posix.mak.orig     2014-02-24 05:23:10.000000000 +0100
-+++ dmd2/src/phobos/posix.mak  2014-03-21 19:46:59.187698023 +0100
-@@ -147,7 +147,7 @@
+--- dmd2/src/phobos/posix.mak.orig     2015-04-25 05:20:30.000000000 +0200
++++ dmd2/src/phobos/posix.mak  2015-07-22 15:28:25.126243307 +0200
+@@ -160,7 +160,7 @@
        PATHSEP:=$(shell echo "\\")
  endif
  
@@ -9,34 +9,23 @@
  
  # Set VERSION, where the file is that contains the version string
  VERSION=../dmd/VERSION
-@@ -236,8 +236,6 @@
+@@ -262,7 +262,7 @@
  # Aggregate all C files over all OSs (this is for the zip file)
  ALL_C_FILES = $(C_FILES) $(C_EXTRAS)
  
 -OBJS = $(addsuffix $(DOTOBJ),$(addprefix $(ROOT)/,$(C_MODULES)))
--
- MAKEFILE = $(firstword $(MAKEFILE_LIST))
- 
- SUBMAKE = $(MAKE) --no-print-directory OS=$(OS) -f $(MAKEFILE)
-@@ -274,8 +272,8 @@
-       @[ -d $(dir $@) ] || mkdir -p $(dir $@) || [ -d $(dir $@) ]
-       $(CC) -c $(CFLAGS) $< -o$@
++OBJS =
  
--$(LIB) : $(OBJS) $(ALL_D_FILES) druntime_libs
--      $(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES) $(OBJS)
-+$(LIB) : $(ALL_D_FILES) druntime_libs
-+      $(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES)
- 
- dll : $(ROOT)/libphobos2.so
+ MAKEFILE = $(firstword $(MAKEFILE_LIST))
  
---- 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)
+--- dmd2/tools/posix.mak.orig  2015-07-21 22:13:45.308848546 +0200
++++ dmd2/tools/posix.mak       2015-07-22 15:29:39.346240185 +0200
+@@ -103,7 +103,7 @@
+       $(DMD) $(MODEL_FLAG) $(DFLAGS) -c -of$(@).o $(<)
+ # grep for the linker invocation and append -lcurl
+       LINKCMD=$$($(DMD) $(MODEL_FLAG) $(DFLAGS) -v -of$(@) $(@).o 2>/dev/null | grep $(@).o); \
+-      $${LINKCMD} -lcurl
++      $${LINKCMD} -lcurl -lz
  
  $(TOOLS) $(DOC_TOOLS): $(ROOT)/%: %.d
        $(DMD) $(MODEL_FLAG) $(DFLAGS) -of$(@) $(<)