fix missing tcpdump include, add missing build_bsae, revert version hacks

Signed-off-by: Stephen L Arnold <[email protected]>

Author: sarnold

build/install_deps_alpine.sh

@@ -2,6 +2,7 @@
 apk update
 apk add \
     bash \
+    build-base \
     git \
     perl \
     make \
@@ -28,4 +29,4 @@ apk add \
     curl \
     rsync \
     util-linux \
-    patch
+    patch

build/lib.sh

@@ -7,7 +7,7 @@ GIT_LIBPCAP="https://github.com/the-tcpdump-group/libpcap.git"
 
 BUILD_DIRECTORY="/build"
 OUTPUT_DIRECTORY="/output"
-GCC_OPTS="-static -fPIC"
+GCC_OPTS="-static -static-libgcc -fPIC"
 GXX_OPTS="-static -static-libstdc++ -fPIC"
 TMP_DIR=$(mktemp -dt building_lib.XXXXXX)
 trap "rm -rf ${TMP_DIR}" EXIT TERM
@@ -174,25 +174,6 @@ get_version(){
     echo "$version"
 }
 
-get_version_simple(){
-    local cmd="$1"
-    if [ -z "$cmd" ];then
-        echo "Please provide a command to determine the version" >&2
-        echo "Example: /build/test --version | awk '{print \$2}'" >&2
-        exit 1
-    fi
-
-    local version="-"
-    version+=$(eval "$cmd")
-
-    if [ "$version" == "-" ];then
-        version+="${CURRENT_ARCH}"
-    else
-        version+="-${CURRENT_ARCH}"
-    fi
-    echo "$version"
-}
-
 lib_create_tmp_dir(){
     local tmp_dir=$(mktemp -dt -p ${TMP_DIR} tmpdir.XXXXXX)
     echo "$tmp_dir"

build/targets/build_tcpdump.sh

@@ -22,7 +22,7 @@ build_tcpdump() {
     # need to create configure when using newer tags
     ./autogen.sh
     export LIBPCAP_PATH="${BUILD_DIRECTORY}/libpcap"
-    CFLAGS="${GCC_OPTS} -I${LIBPCAP_PATH} -L${LIBPCAP_PATH}" \
+    CFLAGS="${GCC_OPTS} -I. -I${LIBPCAP_PATH} -L${LIBPCAP_PATH}" \
         CXXFLAGS="${GXX_OPTS}" \
         CPPFLAGS="-static" \
         LDFLAGS="-static" \
@@ -36,7 +36,7 @@ main() {
     lib_build_libpcap
     build_tcpdump
     local version
-    version=$(get_version_simple "cat ${BUILD_DIRECTORY}/tcpdump/VERSION")
+    version=$(get_version "${BUILD_DIRECTORY}/tcpdump/tcpdump --version 2>&1 | head -n1 | awk '{print \$3}'")
     echo "Got version: ${version}"
     version_number=$(echo "$version" | cut -d"-" -f2)
     cp "${BUILD_DIRECTORY}/tcpdump/tcpdump" "${OUTPUT_DIRECTORY}/tcpdump${version}"