webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "colm: Update to version 0.14.7"

Browse Source 
This reverts commit 59408f2cbf.

https://lists.ipfire.org/pipermail/development/2023-January/015316.html

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Peter Müller
2023-01-27 00:09:21 +00:00
parent 7237ad60c1
commit d95e4d0dd5
3 changed files with 4 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
config/rootfiles/common/colm
View File

@@ -1,48 +1,7 @@
#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
@@ -55,34 +14,8 @@
#usr/include/colm/struct.h
#usr/include/colm/tree.h
#usr/include/colm/type.h
#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-0.13.0.6.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

9
lfs/colm
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 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.14.7
VER = 0.13.0.6
THISAPP = colm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_BLAKE2 = aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f
$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8
install : $(TARGET)
@@ -71,11 +71,8 @@ $(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

43
src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
View File

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