Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/ragel/DEPENDS                                         |    2 
 devel/ragel/HISTORY                                         |    5 
 devel/ragel/PRE_BUILD                                       |    6 -
 devel/ragel/patches/ragel-7.0.4-r2-link-colm-properly.patch |   64 
++++++++++++
 4 files changed, 76 insertions(+), 1 deletion(-)

New commits:
commit a5e1f6fc63ffa5468516fe55c9da9dfaef4d552a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/ragel: fixed linking with colm without .la files

diff --git a/devel/ragel/DEPENDS b/devel/ragel/DEPENDS
index 086767e..6d9ca81 100755
--- a/devel/ragel/DEPENDS
+++ b/devel/ragel/DEPENDS
@@ -1,4 +1,6 @@
 . "$GRIMOIRE"/VDEPENDS &&
+depends autoconf &&
+depends automake &&
 vdepends <<EOF &&
        gcc[CXX]
        colm >= 0.14.7          flags: --with-colm=$INSTALL_ROOT/usr
diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index d3bec1e..5cacfb4 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,8 @@
+2026-10-07 Pavel Vinogradov <public AT sourcemage.org>
+       * DEPENDS: needs autoconf and automake now
+       * PRE_BUILD, patches/ragel-7.0.4-r2-link-colm-properly.patch: added 
patch from
+         Gentoo to fix linking with colm without .la files
+
 2021-05-03 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: dblatex
 
diff --git a/devel/ragel/PRE_BUILD b/devel/ragel/PRE_BUILD
index d8204d3..ebf2cb4 100755
--- a/devel/ragel/PRE_BUILD
+++ b/devel/ragel/PRE_BUILD
@@ -1,4 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 # disable instalation of libtool pseudo-libraries
-sed -E -i '/^[\t ]*(func_show_|$run )eval "[$]install_prog [$]instname /d'   
  ltmain.sh
+sed -E -i '/^[\t ]*(func_show_|$run )eval "[$]install_prog [$]instname /d'   
  ltmain.sh &&
+
+apply_patch_dir "patches" &&
+
+autoreconf -f -i
diff --git a/devel/ragel/patches/ragel-7.0.4-r2-link-colm-properly.patch 
b/devel/ragel/patches/ragel-7.0.4-r2-link-colm-properly.patch
new file mode 100644
index 0000000..82ff98b
--- /dev/null
+++ b/devel/ragel/patches/ragel-7.0.4-r2-link-colm-properly.patch
@@ -0,0 +1,64 @@
+From ad49af2601018298478af6ea6f8ae0ce323d7b28 Mon Sep 17 00:00:00 2001
+From: orbea <orbea AT riseup.net>
+Date: Wed, 4 May 2022 10:23:51 -0700
+Subject: [PATCH] Fix build without .la files
+
+Many distros do no ship .la files which breaks the build
+and additionally when using slibtool instead of GNU libtool
+the .la files are not installed by default.
+
+This fixes the build to use the linker flags -lcolm and -lfsm
+instead.
+---
+ configure.ac    | 16 ++++++++++++----
+ src/Makefile.am |  1 -
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b3a5b4b..9cee5e5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,16 +44,24 @@ AC_ARG_WITH(colm,
+       [
+               COLM="$withval/bin/colm"
+               COLM_WRAP="$withval/bin/colm-wrap"
+-              CPPFLAGS="-I$withval/include ${CPPFLAGS}"
+               CPPFLAGS="-I$withval/include/aapl ${CPPFLAGS}"
+-              LDFLAGS="-L$withval/lib ${LDFLAGS}"
+-              LIBCOLM_LA="$withval/lib/libcolm.la"
+-              LIBFSM_LA="$withval/lib/libfsm.la"
+               COLM_SHARE="$withval/share"
+       ],
+       []
+ )
+ 
++AC_CHECK_LIB(
++      [colm],
++      [colm_run_program],
++      [LIBCOLM_LA=-lcolm],
++      [AC_ERROR([libcolm is required to build ragel])]
++)
++AC_CHECK_LIB(
++      [fsm],
++      [hostLangAsm],
++      [LIBFSM_LA=-lfsm],
++      [AC_ERROR([libfsm is required to build ragel])]
++)
+ AC_CHECK_FILES(
+       [$COLM],
+       [],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c4fe531c..377f7aa4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -39,7 +39,6 @@ nodist_ragel_SOURCES = \
+       parse.c rlreduce.cc
+ 
+ ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+ 
+ BUILT_SOURCES = \
+       version.h \
+-- 
+2.35.1
+