diff options
Diffstat (limited to 'development/colm')
| -rw-r--r-- | development/colm/colm.SlackBuild | 8 | ||||
| -rw-r--r-- | development/colm/colm.info | 6 | ||||
| -rw-r--r-- | development/colm/without-static.patch | 58 |
3 files changed, 66 insertions, 6 deletions
diff --git a/development/colm/colm.SlackBuild b/development/colm/colm.SlackBuild index cb88be17ae..baa966cdd7 100644 --- a/development/colm/colm.SlackBuild +++ b/development/colm/colm.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=colm -VERSION=${VERSION:-0.13.0.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.14.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,7 +64,7 @@ else LIBDIRSUFFIX="" fi -DOCS="COPYING ChangeLog README" +DOCS="COPYING README" set -e @@ -82,6 +82,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch --verbose -p1 -i $CWD/without-static.patch + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/development/colm/colm.info b/development/colm/colm.info index 754b2b2e85..550a97716f 100644 --- a/development/colm/colm.info +++ b/development/colm/colm.info @@ -1,8 +1,8 @@ PRGNAM="colm" -VERSION="0.13.0.7" +VERSION="0.14.7" HOMEPAGE="https://www.colm.net/open-source/colm/" -DOWNLOAD="https://www.colm.net/files/colm/colm-0.13.0.7.tar.gz" -MD5SUM="ae26852e607edb334061ba217fc84d28" +DOWNLOAD="https://www.colm.net/files/colm/colm-0.14.7.tar.gz" +MD5SUM="073b11234fe64a281874b4466c0c25ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/colm/without-static.patch b/development/colm/without-static.patch new file mode 100644 index 0000000000..64ef8720d4 --- /dev/null +++ b/development/colm/without-static.patch @@ -0,0 +1,58 @@ +diff --git a/configure.ac b/configure.ac +index aa127b68..fc034f28 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,7 @@ AC_PROG_CXX + AC_CHECK_TOOL(AR, ar) + AC_PROG_RANLIB + AC_PROG_LIBTOOL ++ + SED_SUBST=["\ + -e 's|@CXX@|${CXX}|g' \ + -e 's|@CC@|${CC}|g' \ +@@ -420,6 +421,13 @@ test -e src/include/colm || ln -s .. src/include/colm + 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 --git a/src/main.cc b/src/main.cc +index 301fae91..8ca395f0 100644 +--- a/src/main.cc ++++ b/src/main.cc +@@ -485,7 +485,14 @@ void compileOutput( const char *argv0, const bool inSource, char *srcLocation ) + " -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 ); + } +diff --git a/src/libfsm/codegen.cc b/src/libfsm/codegen.cc +index 21edb5ac..1150384e 100644 +--- a/src/libfsm/codegen.cc ++++ b/src/libfsm/codegen.cc +@@ -30,6 +30,8 @@ + #include <assert.h> + #include <iomanip> + ++// Convenience: for checking for the presence of the libfsm. ++extern "C" void libfsm_present() {} + + using std::ostream; + using std::ostringstream; |