From 9e8607987322cbb352f7942eaebcd80df3403217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Tue, 21 Jan 2025 08:12:22 +0100
Subject: [PATCH] 2025-01-21 08:12 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * .github/workflows/linux-ci.yml     * reenabled
 hbfimage contrinb library

  * src/vm/Makefile
  * src/vm/vmmt/Makefile
    * set -DHB_FM_STD_ALLOC C compiler parameter for HB_BUILD_TEST='strict'
---
 .github/workflows/linux-ci.yml | 6 +-----
 ChangeLog.txt                  | 8 ++++++++
 src/vm/Makefile                | 4 ++++
 src/vm/vmmt/Makefile           | 4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 3cb4345b7e..541868e7b2 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -40,6 +40,7 @@ jobs:
             libcups2-dev	\
             libcurl4-openssl-dev	\
             firebird-dev	\
+            libfreeimage-dev	\
             libgd-dev	\
             libgs-dev	\
             libmagic-dev	\
@@ -48,9 +49,6 @@ jobs:
             libpq-dev	\
             qtbase5-dev
 
-          # Dependencies for disabled contribs:
-          #  libfreeimage-dev	\
-
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -79,8 +77,6 @@ jobs:
                     esac ;;
           esac
           tee ./.bashrc <<EOENV
-          # These contribs do not build on any platform
-          export HB_BUILD_CONTRIBS="no hbfimage"  # incompatible with freeimage 3.18+
 
           export HB_BUILD_VERBOSE="yes"
           export HBMK_WITH_SQLITE3="local"
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 893b3dfe17..01ab26941a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,14 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-21 08:12 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * .github/workflows/linux-ci.yml
+    * reenabled hbfimage contrinb library
+
+  * src/vm/Makefile
+  * src/vm/vmmt/Makefile
+    * set -DHB_FM_STD_ALLOC C compiler parameter for HB_BUILD_TEST='strict'
+
 2025-01-21 06:45 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * .github/workflows/windows-ci.yml
     * disabled global -Wno-error=... C compiler parameters
diff --git a/src/vm/Makefile b/src/vm/Makefile
index 15d6a32be0..cd2743563e 100644
--- a/src/vm/Makefile
+++ b/src/vm/Makefile
@@ -132,6 +132,10 @@ ifneq ($(HB_MT),no)
    DIRS += vmmt
 endif
 
+ifeq ($(HB_BUILD_TEST),strict)
+   HB_CFLAGS += -DHB_FM_STD_ALLOC
+endif
+
 include $(TOP)$(ROOT)config/lib.mk
 ifneq ($(DIRS),)
    include $(TOP)$(ROOT)config/dir.mk
diff --git a/src/vm/vmmt/Makefile b/src/vm/vmmt/Makefile
index 564c8007d4..deb462ae50 100644
--- a/src/vm/vmmt/Makefile
+++ b/src/vm/vmmt/Makefile
@@ -85,4 +85,8 @@ LIBNAME := hbvmmt
 
 HB_CFLAGS += -DHB_MT_VM
 
+ifeq ($(HB_BUILD_TEST),strict)
+   HB_CFLAGS += -DHB_FM_STD_ALLOC
+endif
+
 include $(TOP)$(ROOT)config/lib.mk