From b982aa726fb3f06f287bfce04ee3cc2441a42dee Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 14 Jun 2010 12:27:08 +0000
Subject: [PATCH] 2010-06-14 14:26 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * external/zlib/Makefile   * config/dos/djgpp.mk     + Added
 patch by Tamas Tevesz targeting djgpp cross-builds:       - makes zlib
 compile with djgpp 2.03       - adding ranlib makes the whole thing
 cross-compile (the linker was         complaining about index not being
 present in the archives)         the reason of the dash prefix is that since
 it wasn't there before,         it must have worked without, so let's not
 break situations where it         isn't present (it is present in bnu219b.zip
 though, and it seems to         be chugging along nicely in a native
 situation as well)       - adds $(HB_CCPATH)$(HB_CCPREFIX) to the bin tools
 used

---
 harbour/ChangeLog              | 13 +++++++++++++
 harbour/config/dos/djgpp.mk    |  4 +++-
 harbour/external/zlib/Makefile |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6f602be49f..fdcb7cb682 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-14 14:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/zlib/Makefile
+  * config/dos/djgpp.mk
+    + Added patch by Tamas Tevesz targeting djgpp cross-builds:
+      - makes zlib compile with djgpp 2.03
+      - adding ranlib makes the whole thing cross-compile (the linker was
+        complaining about index not being present in the archives)
+        the reason of the dash prefix is that since it wasn't there before,
+        it must have worked without, so let's not break situations where it
+        isn't present (it is present in bnu219b.zip though, and it seems to
+        be chugging along nicely in a native situation as well)
+      - adds $(HB_CCPATH)$(HB_CCPREFIX) to the bin tools used
+
 2010-06-14 14:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbffind.c
   * src/rtl/fstemp.c
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index 9fcba8bb84..f97021d570 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -84,6 +84,7 @@ define create_library
    @$(ECHO) $(ECHOQUOTE)SAVE$(ECHOQUOTE) >> __lib__.tmp
    @$(ECHO) $(ECHOQUOTE)END$(ECHOQUOTE) >> __lib__.tmp
    $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
+   -$(RANLIB) $(LIB_DIR)/$@
    $(ARSTRIP)
 endef
 
@@ -101,7 +102,8 @@ define link_exe_file
    -$(LD) @__link__.tmp
 endef
 
-AR := ar
+AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
+RANLIB := $(HB_CCPATH)$(HB_CCPREFIX)ranlib
 AR_RULE = $(create_library)
 
 LD_RULE = $(link_exe_file)
diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile
index be6042712d..c8c9f8d521 100644
--- a/harbour/external/zlib/Makefile
+++ b/harbour/external/zlib/Makefile
@@ -35,6 +35,9 @@ ifneq ($(HB_HAS_ZLIB_LOCAL),)
    ifneq ($(filter $(HB_COMPILER),mingw mingw64 mingwarm cygwin),)
       HB_CFLAGS += -DNO_VIZ
    endif
+   ifeq ($(HB_COMPILER),djgpp)
+      HB_CFLAGS += -DNO_vsnprintf
+   endif
    include $(TOP)$(ROOT)config/lib.mk
 else
    HB_SKIP_REASON := unused