- Update from version 0.13.0.6 to 0.14.7 - Update of rootfile - patch from colm commit fc61ecb required to fix bug of make looking for static and dynamic libs even if one of them was disabled - Changelog is not available in source tarball or on website etc. Changes have to be reviewed by the commits https://github.com/adrian-thurston/colm/commits/0.14.7
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/colm | 69 ++++++++++++++++++- lfs/colm | 9 ++- ...hared-and-link-libcolm-appropriately.patch | 43 ++++++++++++ 3 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm index 7f0d22396..a3ad4bcdd 100644 --- a/config/rootfiles/common/colm +++ b/config/rootfiles/common/colm @@ -1,7 +1,48 @@ #usr/bin/colm +#usr/bin/colm-wrap +#usr/include/aapl +#usr/include/aapl/astring.h +#usr/include/aapl/avlbasic.h +#usr/include/aapl/avlcommon.h +#usr/include/aapl/avlibasic.h +#usr/include/aapl/avlikeyless.h +#usr/include/aapl/avlimap.h +#usr/include/aapl/avlimel.h +#usr/include/aapl/avlimelkey.h +#usr/include/aapl/avliset.h +#usr/include/aapl/avlitree.h +#usr/include/aapl/avlkeyless.h +#usr/include/aapl/avlmap.h +#usr/include/aapl/avlmel.h +#usr/include/aapl/avlmelkey.h +#usr/include/aapl/avlset.h +#usr/include/aapl/avltree.h +#usr/include/aapl/bstcommon.h +#usr/include/aapl/bstmap.h +#usr/include/aapl/bstset.h +#usr/include/aapl/bsttable.h +#usr/include/aapl/bubblesort.h +#usr/include/aapl/buffer.h +#usr/include/aapl/compare.h +#usr/include/aapl/dlcommon.h +#usr/include/aapl/dlist.h +#usr/include/aapl/dlistmel.h +#usr/include/aapl/dlistval.h +#usr/include/aapl/insertsort.h +#usr/include/aapl/mergesort.h +#usr/include/aapl/quicksort.h +#usr/include/aapl/resize.h +#usr/include/aapl/rope.h +#usr/include/aapl/sbstmap.h +#usr/include/aapl/sbstset.h +#usr/include/aapl/sbsttable.h +#usr/include/aapl/svector.h +#usr/include/aapl/table.h +#usr/include/aapl/vector.h #usr/include/colm #usr/include/colm/bytecode.h #usr/include/colm/colm.h +#usr/include/colm/colmex.h #usr/include/colm/config.h #usr/include/colm/debug.h #usr/include/colm/defs.h @@ -14,8 +55,34 @@ #usr/include/colm/struct.h #usr/include/colm/tree.h #usr/include/colm/type.h -#usr/lib/libcolm-0.13.0.6.so +#usr/include/libfsm +#usr/include/libfsm/action.h +#usr/include/libfsm/asm.h +#usr/include/libfsm/common.h +#usr/include/libfsm/dot.h +#usr/include/libfsm/fsmgraph.h +#usr/include/libfsm/gendata.h +#usr/include/libfsm/ragel.h +#usr/include/libfsm/redfsm.h +#usr/lib/libcolm-0.14.7.so #usr/lib/libcolm.la #usr/lib/libcolm.so +#usr/lib/libfsm-0.14.7.so +#usr/lib/libfsm.la +#usr/lib/libfsm.so #usr/share/doc/colm #usr/share/doc/colm/colm.vim +#usr/share/ril.lm +#usr/share/rlhc-c.lm +#usr/share/rlhc-crack.lm +#usr/share/rlhc-csharp.lm +#usr/share/rlhc-d.lm +#usr/share/rlhc-go.lm +#usr/share/rlhc-java.lm +#usr/share/rlhc-js.lm +#usr/share/rlhc-julia.lm +#usr/share/rlhc-main.lm +#usr/share/rlhc-ocaml.lm +#usr/share/rlhc-ruby.lm +#usr/share/rlhc-rust.lm +#usr/share/runtests diff --git a/lfs/colm b/lfs/colm index 5e118336e..5a7d22c93 100644 --- a/lfs/colm +++ b/lfs/colm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 0.13.0.6 +VER = 0.14.7
THISAPP = colm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 +$(DL_FILE)_BLAKE2 = aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f
install : $(TARGET)
@@ -71,8 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ + --disable-manual \ --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch new file mode 100644 index 000000000..65c7ea30d --- /dev/null +++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch @@ -0,0 +1,43 @@ +diff -Naur colm-0.14.7.orig/configure.ac colm-0.14.7/configure.ac +--- colm-0.14.7.orig/configure.ac 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/configure.ac 2023-01-22 16:50:04.910666917 +0100 +@@ -45,6 +45,7 @@ + AC_CHECK_TOOL(AR, ar) + AC_PROG_RANLIB + AC_PROG_LIBTOOL ++ + SED_SUBST=["\ + -e 's|@CXX@|${CXX}|g' \ + -e 's|@CC@|${CC}|g' \ +@@ -424,6 +425,13 @@ + echo "#define VERSION "$VERSION"" > src/version.h + echo "#define PUBDATE "$PUBDATE"" >> src/version.h + ++if test "x$enable_static" = "xyes"; then ++ AC_DEFINE([LINK_STATIC], [1], [Link static lib when invoking C compile and link]) ++fi ++ ++if test "x$enable_shared" = "xyes"; then ++ AC_DEFINE([LINK_SHARED], [1], [Link shared lib when invoking C compile and link]) ++fi + + dnl + dnl Wrap up. +diff -Naur colm-0.14.7.orig/src/main.cc colm-0.14.7/src/main.cc +--- colm-0.14.7.orig/src/main.cc 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/src/main.cc 2023-01-22 16:46:51.225559962 +0100 +@@ -485,7 +485,14 @@ + " -I%s/../aapl" + " -I%s/include" + " -L%s" ++#if defined(LINK_STATIC) + " %s/libcolm.a", ++#elif defined(LINK_SHARED) ++ " %s/libcolm.so", ++#else ++# error "must enabled at least one of shared or static libs" ++#endif ++ + binaryFn, intermedFn, srcLocation, + srcLocation, location, location ); + }
- Update from version 6.0 to 6.1 - Update of rootfile not required - Changelog after 2005 is only available by reviewing the git commits https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/log/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/ethtool | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/ethtool b/lfs/ethtool index 59f77628d..2b13cb424 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 6.0 +VER = 6.1
THISAPP = ethtool-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 24bbde83e03d7f18345360dbf330dc811663c5b755e57f18e35c0206692d331d9dce830a479cd2a08b26c2c67107a99443cfcbb9c68416d3fe07e505f99efbd5 +$(DL_FILE)_BLAKE2 = 002a4edffda42520d77e8f0c27adf909090823f1a08689b67fc7c75de3048bdc9c94d7d32973bd17562d7dbf295479e796c2529b5db66b5fce42a2ede5851cd6
install : $(TARGET)
Reviewed-by: Peter Müller peter.mueller@ipfire.org
- Update from version 6.0 to 6.1
- Update of rootfile not required
- Changelog after 2005 is only available by reviewing the git commits https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/log/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
lfs/ethtool | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/ethtool b/lfs/ethtool index 59f77628d..2b13cb424 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 6.0 +VER = 6.1
THISAPP = ethtool-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 24bbde83e03d7f18345360dbf330dc811663c5b755e57f18e35c0206692d331d9dce830a479cd2a08b26c2c67107a99443cfcbb9c68416d3fe07e505f99efbd5 +$(DL_FILE)_BLAKE2 = 002a4edffda42520d77e8f0c27adf909090823f1a08689b67fc7c75de3048bdc9c94d7d32973bd17562d7dbf295479e796c2529b5db66b5fce42a2ede5851cd6
install : $(TARGET)
- Update from version 2.13.1 (2018) to 2.14.1 (Oct 2022) - 8 versions - Update of rootfile - Changelog is the gitlab repository commits https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commits/main/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/fontconfig | 12 ++++++++++++ lfs/fontconfig | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/fontconfig b/config/rootfiles/common/fontconfig index e3d100505..2ca3e4649 100644 --- a/config/rootfiles/common/fontconfig +++ b/config/rootfiles/common/fontconfig @@ -2,11 +2,15 @@ #etc/fonts/conf.d etc/fonts/conf.d/10-hinting-slight.conf etc/fonts/conf.d/10-scale-bitmap-fonts.conf +etc/fonts/conf.d/10-sub-pixel-rgb.conf +etc/fonts/conf.d/10-yes-antialias.conf +etc/fonts/conf.d/11-lcdfilter-default.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf etc/fonts/conf.d/40-nonlatin.conf etc/fonts/conf.d/45-generic.conf etc/fonts/conf.d/45-latin.conf +etc/fonts/conf.d/48-spacing.conf etc/fonts/conf.d/49-sansserif.conf etc/fonts/conf.d/50-user.conf etc/fonts/conf.d/51-local.conf @@ -39,11 +43,14 @@ usr/lib/libfontconfig.so.1.12.0 #usr/lib/pkgconfig/fontconfig.pc #usr/share/fontconfig #usr/share/fontconfig/conf.avail +#usr/share/fontconfig/conf.avail/05-reset-dirs-sample.conf +#usr/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf #usr/share/fontconfig/conf.avail/10-autohint.conf #usr/share/fontconfig/conf.avail/10-hinting-full.conf #usr/share/fontconfig/conf.avail/10-hinting-medium.conf #usr/share/fontconfig/conf.avail/10-hinting-none.conf #usr/share/fontconfig/conf.avail/10-hinting-slight.conf +#usr/share/fontconfig/conf.avail/10-no-antialias.conf #usr/share/fontconfig/conf.avail/10-no-sub-pixel.conf #usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf #usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf @@ -51,15 +58,18 @@ usr/lib/libfontconfig.so.1.12.0 #usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf #usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf #usr/share/fontconfig/conf.avail/10-unhinted.conf +#usr/share/fontconfig/conf.avail/10-yes-antialias.conf #usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf #usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf #usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf #usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf #usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf #usr/share/fontconfig/conf.avail/30-metric-aliases.conf +#usr/share/fontconfig/conf.avail/35-lang-normalize.conf #usr/share/fontconfig/conf.avail/40-nonlatin.conf #usr/share/fontconfig/conf.avail/45-generic.conf #usr/share/fontconfig/conf.avail/45-latin.conf +#usr/share/fontconfig/conf.avail/48-spacing.conf #usr/share/fontconfig/conf.avail/49-sansserif.conf #usr/share/fontconfig/conf.avail/50-user.conf #usr/share/fontconfig/conf.avail/51-local.conf @@ -75,6 +85,8 @@ usr/lib/libfontconfig.so.1.12.0 #usr/share/fontconfig/conf.avail/90-synthetic.conf #usr/share/gettext/its/fontconfig.its #usr/share/gettext/its/fontconfig.loc +#usr/share/locale/ka/LC_MESSAGES/fontconfig-conf.mo +#usr/share/locale/ka/LC_MESSAGES/fontconfig.mo #usr/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo #usr/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo #usr/share/xml diff --git a/lfs/fontconfig b/lfs/fontconfig index ec8d9f398..4add7abfd 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,8 +24,8 @@
include Config
-VER = 2.13.1 -SUMMARY = NFSv4 User and Group ID Mapping Library +VER = 2.14.1 +SUMMARY = Library for configuring and customizing font access
THISAPP = fontconfig-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 +$(DL_FILE)_BLAKE2 = 870f7936b0ffb7afce37b1c6909cacfaff3a0613a4d0dabddb1e0ec5672018fb80e1aca9d22e3f31579edd304e3cc55a45dd392e199646bbc86a11d4a99e0f35
install : $(TARGET)
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && rm -vf src/fcobjshash.h + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \
- Update from version 3.11.0 to 3.13.0 - Update of rootfile - Changelog libfuse 3.13.0 (2023-01-13) - There is a new low-level API function `fuse_session_custom_io` that allows to implement a daemon with a custom io. This can be used to create a daemon that can process incoming FUSE requests to other destinations than `/dev/fuse`. - A segfault when loading custom FUSE modules has been fixed. - There is a new `fuse_notify_expire_entry` function. - A deadlock when resolving paths in the high-level API has been fixed. - libfuse can now be build explicitly for C libraries without symbol versioning support. libfuse 3.12.0 (2022-09-08) - There is a new build parameter to specify where the SysV init script should be installed. - The *max_idle_threads* parameter has been deprecated in favor of the new max_threads* parameter (which avoids the excessive overhead of creating and destructing threads). Using max_threads == 1 and calling fuse_session_loop_mt() will run single threaded similar to fuse_session_loop(). The following changes apply when using the most recent API (-DFUSE_USE_VERSION=312, see `example/passthrough_hp.cc` for an example for how to usse the new API): - `struct fuse_loop_config` is now private and has to be constructed using - fuse_loop_cfg_create()* and detroyed with *fuse_loop_cfg_destroy()*. Parameters can be - changed using `fuse_loop_cfg_set_*()` functions. - fuse_session_loop_mt()* now accepts `struct fuse_loop_config *` as NULL pointer. - fuse_parse_cmdline()* now accepts a *max_threads* option.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/fuse | 2 +- lfs/fuse | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index 5abecd3e8..6ab1a38ee 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -12,7 +12,7 @@ usr/bin/fusermount3 #usr/include/fuse3/fuse_opt.h #usr/lib/libfuse3.so usr/lib/libfuse3.so.3 -usr/lib/libfuse3.so.3.11.0 +usr/lib/libfuse3.so.3.13.0 #usr/lib/pkgconfig/fuse3.pc #usr/share/man/man1/fusermount3.1 #usr/share/man/man8/mount.fuse3.8 diff --git a/lfs/fuse b/lfs/fuse index ee0a40c95..455f40ce1 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.11.0 +VER = 3.13.0
THISAPP = fuse-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 +$(DL_FILE)_BLAKE2 = b9428f27c431c30deca48cf4b76761c120ebbdb6d22789c19fa25ffbff47c752690e7d0a0b28b70bff2b8f9063272adc65dc084ee45036548452ae891fb77ab2
install : $(TARGET)
Reviewed-by: Peter Müller peter.mueller@ipfire.org
- Update from version 3.11.0 to 3.13.0
- Update of rootfile
- Changelog
libfuse 3.13.0 (2023-01-13)
- There is a new low-level API function `fuse_session_custom_io` that allows to implement a daemon with a custom io. This can be used to create a daemon that can process incoming FUSE requests to other destinations than `/dev/fuse`.
- A segfault when loading custom FUSE modules has been fixed.
- There is a new `fuse_notify_expire_entry` function.
- A deadlock when resolving paths in the high-level API has been fixed.
- libfuse can now be build explicitly for C libraries without symbol versioning support.
libfuse 3.12.0 (2022-09-08)
- There is a new build parameter to specify where the SysV init script should be installed.
- The *max_idle_threads* parameter has been deprecated in favor of the new max_threads* parameter (which avoids the excessive overhead of creating and destructing threads). Using max_threads == 1 and calling fuse_session_loop_mt() will run single threaded similar to fuse_session_loop().
The following changes apply when using the most recent API (-DFUSE_USE_VERSION=312, see `example/passthrough_hp.cc` for an example for how to usse the new API):
- `struct fuse_loop_config` is now private and has to be constructed using
- fuse_loop_cfg_create()* and detroyed with *fuse_loop_cfg_destroy()*. Parameters can be
- changed using `fuse_loop_cfg_set_*()` functions.
- fuse_session_loop_mt()* now accepts `struct fuse_loop_config *` as NULL pointer.
- fuse_parse_cmdline()* now accepts a *max_threads* option.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/fuse | 2 +- lfs/fuse | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index 5abecd3e8..6ab1a38ee 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -12,7 +12,7 @@ usr/bin/fusermount3 #usr/include/fuse3/fuse_opt.h #usr/lib/libfuse3.so usr/lib/libfuse3.so.3 -usr/lib/libfuse3.so.3.11.0 +usr/lib/libfuse3.so.3.13.0 #usr/lib/pkgconfig/fuse3.pc #usr/share/man/man1/fusermount3.1 #usr/share/man/man8/mount.fuse3.8 diff --git a/lfs/fuse b/lfs/fuse index ee0a40c95..455f40ce1 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 3.11.0 +VER = 3.13.0
THISAPP = fuse-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 +$(DL_FILE)_BLAKE2 = b9428f27c431c30deca48cf4b76761c120ebbdb6d22789c19fa25ffbff47c752690e7d0a0b28b70bff2b8f9063272adc65dc084ee45036548452ae891fb77ab2
install : $(TARGET)
- Update from version 7.0.0.11 to 7.0.4 - Update of rootfile - Changelog updated language flags, catch abortcompile throw in non-ragel progs 7.0.3 This version of colm includes a critical fix for big-endian system. Fixes #61. expect colm version 0.14.6 and version bump ragel to 7.0.3 7.0.2 Latest colm includes bugfixes for refcounting, which fixes a ragel issue with includes #58. expect colm 0.14.5 and version bump to 7.0.2 7.0.1 removed accidental commit of ragel/.exrc 7.0.0.12 implemented NfaClear in asm codegen
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/ragel | 52 ++--------------------------------- lfs/ragel | 9 ++++-- 2 files changed, 8 insertions(+), 53 deletions(-)
diff --git a/config/rootfiles/common/ragel b/config/rootfiles/common/ragel index 6b16f03d2..9c0b469b2 100644 --- a/config/rootfiles/common/ragel +++ b/config/rootfiles/common/ragel @@ -11,60 +11,12 @@ #usr/bin/ragel-ocaml #usr/bin/ragel-ruby #usr/bin/ragel-rust -#usr/include/ragel -#usr/include/ragel/action.h -#usr/include/ragel/avlbasic.h -#usr/include/ragel/avlcommon.h -#usr/include/ragel/avlibasic.h -#usr/include/ragel/avlikeyless.h -#usr/include/ragel/avlimap.h -#usr/include/ragel/avlimel.h -#usr/include/ragel/avlimelkey.h -#usr/include/ragel/avliset.h -#usr/include/ragel/avlitree.h -#usr/include/ragel/avlkeyless.h -#usr/include/ragel/avlmap.h -#usr/include/ragel/avlmel.h -#usr/include/ragel/avlmelkey.h -#usr/include/ragel/avlset.h -#usr/include/ragel/avltree.h -#usr/include/ragel/bstcommon.h -#usr/include/ragel/bstmap.h -#usr/include/ragel/bstset.h -#usr/include/ragel/bsttable.h -#usr/include/ragel/bubblesort.h -#usr/include/ragel/common.h -#usr/include/ragel/compare.h -#usr/include/ragel/config.h -#usr/include/ragel/dlcommon.h -#usr/include/ragel/dlist.h -#usr/include/ragel/dlistmel.h -#usr/include/ragel/dlistval.h -#usr/include/ragel/dot.h -#usr/include/ragel/fsmgraph.h -#usr/include/ragel/gendata.h -#usr/include/ragel/insertsort.h -#usr/include/ragel/mergesort.h -#usr/include/ragel/quicksort.h -#usr/include/ragel/ragel.h -#usr/include/ragel/redfsm.h -#usr/include/ragel/resize.h -#usr/include/ragel/sbstmap.h -#usr/include/ragel/sbstset.h -#usr/include/ragel/sbsttable.h -#usr/include/ragel/svector.h -#usr/include/ragel/table.h -#usr/include/ragel/vector.h -#usr/lib/libfsm.la -#usr/lib/libfsm.so -#usr/lib/libfsm.so.0 -#usr/lib/libfsm.so.0.0.0 #usr/lib/libragel.la #usr/lib/libragel.so #usr/lib/libragel.so.0 #usr/lib/libragel.so.0.0.0 #usr/share/doc/ragel -#usr/share/doc/ragel/CREDITS -#usr/share/doc/ragel/ChangeLog +#usr/share/doc/ragel/ragel.vim #usr/share/man/man1/ragel.1 +#usr/share/out-go.lm #usr/share/ragel.lm diff --git a/lfs/ragel b/lfs/ragel index caca45921..ee6f73303 100644 --- a/lfs/ragel +++ b/lfs/ragel @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 7.0.0.11 +VER = 7.0.4
THISAPP = ragel-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d967251d4eeb06a0fb2c5f3bf398dbc53fe4499b092113bb948f03b50f9e468cf510b2196055544ae65a47559ad5baed57238ac92c8aae5300873716ddd070b1 +$(DL_FILE)_BLAKE2 = a8fcf7a6c772320ec9183100573a2238c118a8b4ef3b40c9c673a2898d5fd1e7707a773b8712d8e7bfdd22d62a64ba24174748d9a899eb1481e2c56a2ac48e9f
install : $(TARGET)
@@ -70,8 +70,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ + --with-colm=/usr \ + --disable-manual \ --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
Hello Adolf,
thank you for this patch. It looks good to me, but there is already a source tarball on https://source.ipfire.org/source-2.x/colm-0.14.7.tar.gz (Marcel put it there on 2021-09-19, but it has a different checksum:
$ b2sum colm-0.14.7* aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f colm-0.14.7-github.tar.gz c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c colm-0.14.7-ipfire.tar.gz
Attempting to download colm's tarball from https://github.com/adrian-thurston/colm/archive/refs/tags/0.14.7.tar.gz, I get a file that has the same checksum as your patch does. A superficial investigation did not turn up the source of the c8be... tarball.
@Marcel: Where did you download it from?
Thanks, and best regards, Peter Müller
- Update from version 0.13.0.6 to 0.14.7
- Update of rootfile
- patch from colm commit fc61ecb required to fix bug of make looking for static and dynamic libs even if one of them was disabled
- Changelog is not available in source tarball or on website etc. Changes have to be reviewed by the commits https://github.com/adrian-thurston/colm/commits/0.14.7
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/colm | 69 ++++++++++++++++++- lfs/colm | 9 ++- ...hared-and-link-libcolm-appropriately.patch | 43 ++++++++++++ 3 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm index 7f0d22396..a3ad4bcdd 100644 --- a/config/rootfiles/common/colm +++ b/config/rootfiles/common/colm @@ -1,7 +1,48 @@ #usr/bin/colm +#usr/bin/colm-wrap +#usr/include/aapl +#usr/include/aapl/astring.h +#usr/include/aapl/avlbasic.h +#usr/include/aapl/avlcommon.h +#usr/include/aapl/avlibasic.h +#usr/include/aapl/avlikeyless.h +#usr/include/aapl/avlimap.h +#usr/include/aapl/avlimel.h +#usr/include/aapl/avlimelkey.h +#usr/include/aapl/avliset.h +#usr/include/aapl/avlitree.h +#usr/include/aapl/avlkeyless.h +#usr/include/aapl/avlmap.h +#usr/include/aapl/avlmel.h +#usr/include/aapl/avlmelkey.h +#usr/include/aapl/avlset.h +#usr/include/aapl/avltree.h +#usr/include/aapl/bstcommon.h +#usr/include/aapl/bstmap.h +#usr/include/aapl/bstset.h +#usr/include/aapl/bsttable.h +#usr/include/aapl/bubblesort.h +#usr/include/aapl/buffer.h +#usr/include/aapl/compare.h +#usr/include/aapl/dlcommon.h +#usr/include/aapl/dlist.h +#usr/include/aapl/dlistmel.h +#usr/include/aapl/dlistval.h +#usr/include/aapl/insertsort.h +#usr/include/aapl/mergesort.h +#usr/include/aapl/quicksort.h +#usr/include/aapl/resize.h +#usr/include/aapl/rope.h +#usr/include/aapl/sbstmap.h +#usr/include/aapl/sbstset.h +#usr/include/aapl/sbsttable.h +#usr/include/aapl/svector.h +#usr/include/aapl/table.h +#usr/include/aapl/vector.h #usr/include/colm #usr/include/colm/bytecode.h #usr/include/colm/colm.h +#usr/include/colm/colmex.h #usr/include/colm/config.h #usr/include/colm/debug.h #usr/include/colm/defs.h @@ -14,8 +55,34 @@ #usr/include/colm/struct.h #usr/include/colm/tree.h #usr/include/colm/type.h -#usr/lib/libcolm-0.13.0.6.so +#usr/include/libfsm +#usr/include/libfsm/action.h +#usr/include/libfsm/asm.h +#usr/include/libfsm/common.h +#usr/include/libfsm/dot.h +#usr/include/libfsm/fsmgraph.h +#usr/include/libfsm/gendata.h +#usr/include/libfsm/ragel.h +#usr/include/libfsm/redfsm.h +#usr/lib/libcolm-0.14.7.so #usr/lib/libcolm.la #usr/lib/libcolm.so +#usr/lib/libfsm-0.14.7.so +#usr/lib/libfsm.la +#usr/lib/libfsm.so #usr/share/doc/colm #usr/share/doc/colm/colm.vim +#usr/share/ril.lm +#usr/share/rlhc-c.lm +#usr/share/rlhc-crack.lm +#usr/share/rlhc-csharp.lm +#usr/share/rlhc-d.lm +#usr/share/rlhc-go.lm +#usr/share/rlhc-java.lm +#usr/share/rlhc-js.lm +#usr/share/rlhc-julia.lm +#usr/share/rlhc-main.lm +#usr/share/rlhc-ocaml.lm +#usr/share/rlhc-ruby.lm +#usr/share/rlhc-rust.lm +#usr/share/runtests diff --git a/lfs/colm b/lfs/colm index 5e118336e..5a7d22c93 100644 --- a/lfs/colm +++ b/lfs/colm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 0.13.0.6 +VER = 0.14.7
THISAPP = colm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 +$(DL_FILE)_BLAKE2 = aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f
install : $(TARGET)
@@ -71,8 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
- cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \
--disable-manual \diff --git a/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch new file mode 100644 index 000000000..65c7ea30d --- /dev/null +++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch @@ -0,0 +1,43 @@ +diff -Naur colm-0.14.7.orig/configure.ac colm-0.14.7/configure.ac +--- colm-0.14.7.orig/configure.ac 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/configure.ac 2023-01-22 16:50:04.910666917 +0100 +@@ -45,6 +45,7 @@
- AC_CHECK_TOOL(AR, ar)
- AC_PROG_RANLIB
- AC_PROG_LIBTOOL
++
- SED_SUBST=["\
- -e 's|@CXX@|${CXX}|g' \
- -e 's|@CC@|${CC}|g' \
+@@ -424,6 +425,13 @@
- echo "#define VERSION "$VERSION"" > src/version.h
- echo "#define PUBDATE "$PUBDATE"" >> src/version.h
++if test "x$enable_static" = "xyes"; then ++ AC_DEFINE([LINK_STATIC], [1], [Link static lib when invoking C compile and link]) ++fi ++ ++if test "x$enable_shared" = "xyes"; then ++ AC_DEFINE([LINK_SHARED], [1], [Link shared lib when invoking C compile and link]) ++fi
- dnl
- dnl Wrap up.
+diff -Naur colm-0.14.7.orig/src/main.cc colm-0.14.7/src/main.cc +--- colm-0.14.7.orig/src/main.cc 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/src/main.cc 2023-01-22 16:46:51.225559962 +0100 +@@ -485,7 +485,14 @@
" -I%s/../aapl"" -I%s/include"" -L%s"++#if defined(LINK_STATIC)
" %s/libcolm.a",++#elif defined(LINK_SHARED) ++ " %s/libcolm.so", ++#else ++# error "must enabled at least one of shared or static libs" ++#endif ++
binaryFn, intermedFn, srcLocation,srcLocation, location, location );- }
Hi Peter,
On 27/01/2023 01:08, Peter Müller wrote:
Hello Adolf,
thank you for this patch. It looks good to me, but there is already a source tarball on https://source.ipfire.org/source-2.x/colm-0.14.7.tar.gz (Marcel put it there on 2021-09-19, but it has a different checksum:
$ b2sum colm-0.14.7* aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f colm-0.14.7-github.tar.gz c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c colm-0.14.7-ipfire.tar.gz
Attempting to download colm's tarball from https://github.com/adrian-thurston/colm/archive/refs/tags/0.14.7.tar.gz, I get a file that has the same checksum as your patch does. A superficial investigation did not turn up the source of the c8be... tarball.
Yes, I downloaded my file from the github source. Also for the ragel version.
The c8be tarball is from http://www.colm.net/files/colm/colm-0.14.7.tar.gz The link for that is on the http://www.colm.net/open-source/colm/ page.
I found the colm and ragel github location first so used that. It is the source that Arch Linux uses and when I am looking for the source I always first check where Arch Linux is downloading it from and try that location.
How should we decide where to get source files from if they are in two locations and how do you identify if there are multiple locations. Is github preferred for the source or is it the last location that should be used.
Regards, Adolf.
@Marcel: Where did you download it from?
Thanks, and best regards, Peter Müller
- Update from version 0.13.0.6 to 0.14.7
- Update of rootfile
- patch from colm commit fc61ecb required to fix bug of make looking for static and dynamic libs even if one of them was disabled
- Changelog is not available in source tarball or on website etc. Changes have to be reviewed by the commits https://github.com/adrian-thurston/colm/commits/0.14.7
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/colm | 69 ++++++++++++++++++- lfs/colm | 9 ++- ...hared-and-link-libcolm-appropriately.patch | 43 ++++++++++++ 3 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm index 7f0d22396..a3ad4bcdd 100644 --- a/config/rootfiles/common/colm +++ b/config/rootfiles/common/colm @@ -1,7 +1,48 @@ #usr/bin/colm +#usr/bin/colm-wrap +#usr/include/aapl +#usr/include/aapl/astring.h +#usr/include/aapl/avlbasic.h +#usr/include/aapl/avlcommon.h +#usr/include/aapl/avlibasic.h +#usr/include/aapl/avlikeyless.h +#usr/include/aapl/avlimap.h +#usr/include/aapl/avlimel.h +#usr/include/aapl/avlimelkey.h +#usr/include/aapl/avliset.h +#usr/include/aapl/avlitree.h +#usr/include/aapl/avlkeyless.h +#usr/include/aapl/avlmap.h +#usr/include/aapl/avlmel.h +#usr/include/aapl/avlmelkey.h +#usr/include/aapl/avlset.h +#usr/include/aapl/avltree.h +#usr/include/aapl/bstcommon.h +#usr/include/aapl/bstmap.h +#usr/include/aapl/bstset.h +#usr/include/aapl/bsttable.h +#usr/include/aapl/bubblesort.h +#usr/include/aapl/buffer.h +#usr/include/aapl/compare.h +#usr/include/aapl/dlcommon.h +#usr/include/aapl/dlist.h +#usr/include/aapl/dlistmel.h +#usr/include/aapl/dlistval.h +#usr/include/aapl/insertsort.h +#usr/include/aapl/mergesort.h +#usr/include/aapl/quicksort.h +#usr/include/aapl/resize.h +#usr/include/aapl/rope.h +#usr/include/aapl/sbstmap.h +#usr/include/aapl/sbstset.h +#usr/include/aapl/sbsttable.h +#usr/include/aapl/svector.h +#usr/include/aapl/table.h +#usr/include/aapl/vector.h #usr/include/colm #usr/include/colm/bytecode.h #usr/include/colm/colm.h +#usr/include/colm/colmex.h #usr/include/colm/config.h #usr/include/colm/debug.h #usr/include/colm/defs.h @@ -14,8 +55,34 @@ #usr/include/colm/struct.h #usr/include/colm/tree.h #usr/include/colm/type.h -#usr/lib/libcolm-0.13.0.6.so +#usr/include/libfsm +#usr/include/libfsm/action.h +#usr/include/libfsm/asm.h +#usr/include/libfsm/common.h +#usr/include/libfsm/dot.h +#usr/include/libfsm/fsmgraph.h +#usr/include/libfsm/gendata.h +#usr/include/libfsm/ragel.h +#usr/include/libfsm/redfsm.h +#usr/lib/libcolm-0.14.7.so #usr/lib/libcolm.la #usr/lib/libcolm.so +#usr/lib/libfsm-0.14.7.so +#usr/lib/libfsm.la +#usr/lib/libfsm.so #usr/share/doc/colm #usr/share/doc/colm/colm.vim +#usr/share/ril.lm +#usr/share/rlhc-c.lm +#usr/share/rlhc-crack.lm +#usr/share/rlhc-csharp.lm +#usr/share/rlhc-d.lm +#usr/share/rlhc-go.lm +#usr/share/rlhc-java.lm +#usr/share/rlhc-js.lm +#usr/share/rlhc-julia.lm +#usr/share/rlhc-main.lm +#usr/share/rlhc-ocaml.lm +#usr/share/rlhc-ruby.lm +#usr/share/rlhc-rust.lm +#usr/share/runtests diff --git a/lfs/colm b/lfs/colm index 5e118336e..5a7d22c93 100644 --- a/lfs/colm +++ b/lfs/colm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 0.13.0.6 +VER = 0.14.7
THISAPP = colm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 +$(DL_FILE)_BLAKE2 = aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f
install : $(TARGET)
@@ -71,8 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
- cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \
--disable-manual \diff --git a/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch new file mode 100644 index 000000000..65c7ea30d --- /dev/null +++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch @@ -0,0 +1,43 @@ +diff -Naur colm-0.14.7.orig/configure.ac colm-0.14.7/configure.ac +--- colm-0.14.7.orig/configure.ac 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/configure.ac 2023-01-22 16:50:04.910666917 +0100 +@@ -45,6 +45,7 @@
- AC_CHECK_TOOL(AR, ar)
- AC_PROG_RANLIB
- AC_PROG_LIBTOOL
++
- SED_SUBST=["\
- -e 's|@CXX@|${CXX}|g' \
- -e 's|@CC@|${CC}|g' \
+@@ -424,6 +425,13 @@
- echo "#define VERSION "$VERSION"" > src/version.h
- echo "#define PUBDATE "$PUBDATE"" >> src/version.h
++if test "x$enable_static" = "xyes"; then ++ AC_DEFINE([LINK_STATIC], [1], [Link static lib when invoking C compile and link]) ++fi ++ ++if test "x$enable_shared" = "xyes"; then ++ AC_DEFINE([LINK_SHARED], [1], [Link shared lib when invoking C compile and link]) ++fi
- dnl
- dnl Wrap up.
+diff -Naur colm-0.14.7.orig/src/main.cc colm-0.14.7/src/main.cc +--- colm-0.14.7.orig/src/main.cc 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/src/main.cc 2023-01-22 16:46:51.225559962 +0100 +@@ -485,7 +485,14 @@
" -I%s/../aapl"" -I%s/include"" -L%s"++#if defined(LINK_STATIC)
" %s/libcolm.a",++#elif defined(LINK_SHARED) ++ " %s/libcolm.so", ++#else ++# error "must enabled at least one of shared or static libs" ++#endif ++
binaryFn, intermedFn, srcLocation,srcLocation, location, location );- }
-
Adolf Belka -
Peter Müller