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

@@ -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

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)

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