-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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>
- Loading branch information
Showing
3 changed files
with
117 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...es/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 ); | ||
| } |