colm: Update to version 0.14.7

- 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>
This commit is contained in:
Adolf Belka
2023-01-23 10:06:34 +01:00
committed by Peter Müller
parent 26562e76a3
commit 59408f2cbf
3 changed files with 117 additions and 4 deletions

View File

@@ -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 );
}