Upgrade version to 0.14.7

Signed-off-by: cherry530 <707078654@qq.com>
This commit is contained in:
cherry530 2023-09-14 11:26:10 +08:00
parent ed8db2ada2
commit f8df3b395f
6 changed files with 86 additions and 6 deletions

45
change-config.patch Normal file
View File

@ -0,0 +1,45 @@
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 );
}

Binary file not shown.

Binary file not shown.

BIN
colm-0.14.7.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,23 @@
From 28b6e0a01157049b4cb279b0ef25ea9dcf3b46ed Mon Sep 17 00:00:00 2001
From: Adrian Thurston <thurston@colm.net>
Date: Sun, 12 Mar 2023 13:17:42 -0700
Subject: [PATCH] include an extern C function in libfsm so we can use
AC_CHECK_LIB
---
src/libfsm/codegen.cc | 2 ++
1 file changed, 2 insertions(+)
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;

View File

@ -1,5 +1,5 @@
Name: colm
Version: 0.13.0.7
Version: 0.14.7
Release: 1
Summary: Programming language designed for the analysis of computer languages
@ -7,6 +7,8 @@ Summary: Programming language designed for the analysis of computer langu
License: MIT and LGPLv2+
URL: https://www.colm.net/open-source/colm/
Source0: https://www.colm.net/files/%{name}/%{name}-%{version}.tar.gz
Patch0: change-config.patch
Patch1: colm-libfsm-ac_check_lib.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -32,7 +34,7 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%{summary}.
%prep
%autosetup
%autosetup -p1
# Do not pollute with docs
sed -i -e "/dist_doc_DATA/d" Makefile.am
@ -50,21 +52,31 @@ install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{
%files
%license COPYING
%doc ChangeLog README
%{_bindir}/%{name}
%doc README
%{_bindir}/%{name}*
%{_libdir}/lib%{name}-%{version}.so
%dir %{_datadir}/vim
%dir %{_datadir}/vim/vimfiles
%dir %{_datadir}/vim/vimfiles/syntax
%{_datadir}/vim/vimfiles/syntax/%{name}.vim
%{_datadir}/doc/%{name}/*
%{_datadir}/*.lm
%{_datadir}/runtests
%files devel
%{_libdir}/lib%{name}.so
%{_libdir}/libfsm*
%{_includedir}/%{name}/
%{_docdir}/%{name}/*
%{_includedir}/libfsm*
%{_includedir}/aapl*
%changelog
* Tue Jun 23 2020 Yikun Jiang <yikunkero@gmail.com>
* Thu Sep 14 2023 xu_ping <707078654@qq.com> - 0.14.7-1
- Upgrade version to 0.14.7
* Tue Jun 23 2020 Yikun Jiang <yikunkero@gmail.com> - 0.13.0.7-1
- bump version to 0.13.0.7
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com>
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com> - 0.14.0-1
- Package init