firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:43:02 +01:00
Code Issues

Fix docker Linux build after introduction of libcds.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-12-02 22:15:40 -03:00
parent 2865b71023
commit a25f3c3cf8
15 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/docker/linux/arm32-arm64/Dockerfile
View File

@ -6,7 +6,7 @@ ARG ARG_CTNG_VERSION=1.25.0
ARG ARG_LIBTOOL_VERSION=2.4.6 ARG ARG_LIBTOOL_VERSION=2.4.6
ARG ARG_NCURSES_VERSION=6.3 ARG ARG_NCURSES_VERSION=6.3
ARG ARG_LTM_VERSION=1.2.0 ARG ARG_LTM_VERSION=1.2.0
ARG ARG_ZLIB_VERSION=1.2.12 ARG ARG_ZLIB_VERSION=1.2.13
ARG ARG_ICU_VERSION=70-1 ARG ARG_ICU_VERSION=70-1
ARG ARG_CPUCOUNT=6 ARG ARG_CPUCOUNT=6
@ -213,6 +213,7 @@ ARG ARG_CTNG_GID
RUN apt-get update && \ RUN apt-get update && \
apt-get -y install \ apt-get -y install \
cmake \
libc6-amd64-cross \ libc6-amd64-cross \
libfile-copy-recursive-perl \ libfile-copy-recursive-perl \
unzip && \ unzip && \

1
builds/docker/linux/arm32-arm64/build-arm32.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
docker build \ docker build \
--pull \
--build-arg ARG_BASE=arm32v7/ubuntu:22.04 \ --build-arg ARG_BASE=arm32v7/ubuntu:22.04 \
--build-arg ARG_TARGET_ARCH=arm-pc-linux-gnueabihf \ --build-arg ARG_TARGET_ARCH=arm-pc-linux-gnueabihf \
--build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm32 \ --build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm32 \

1
builds/docker/linux/arm32-arm64/build-arm64.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
docker build \ docker build \
--pull \
--build-arg ARG_BASE=arm64v8/ubuntu:22.04 \ --build-arg ARG_BASE=arm64v8/ubuntu:22.04 \
--build-arg ARG_TARGET_ARCH=aarch64-pc-linux-gnu \ --build-arg ARG_TARGET_ARCH=aarch64-pc-linux-gnu \
--build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm64 \ --build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm64 \

4
builds/docker/linux/arm32-arm64/crosstool-ng-config-arm32
View File

@ -837,8 +837,8 @@ CT_ZLIB_PKG_NAME="zlib"
CT_ZLIB_SRC_RELEASE=y CT_ZLIB_SRC_RELEASE=y
# CT_ZLIB_SRC_DEVEL is not set # CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_PATCH_ORDER="global"
CT_ZLIB_V_1_2_12=y CT_ZLIB_V_1_2_13=y
CT_ZLIB_VERSION="1.2.12" CT_ZLIB_VERSION="1.2.13"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

4
builds/docker/linux/arm32-arm64/crosstool-ng-config-arm64
View File

@ -812,8 +812,8 @@ CT_ZLIB_PKG_NAME="zlib"
CT_ZLIB_SRC_RELEASE=y CT_ZLIB_SRC_RELEASE=y
# CT_ZLIB_SRC_DEVEL is not set # CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_PATCH_ORDER="global"
CT_ZLIB_V_1_2_12=y CT_ZLIB_V_1_2_13=y
CT_ZLIB_VERSION="1.2.12" CT_ZLIB_VERSION="1.2.13"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

1
builds/docker/linux/arm32-arm64/scripts/build.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
./autogen.sh \ ./autogen.sh \
--host=$BUILD_ARCH \ --host=$BUILD_ARCH \

2
builds/docker/linux/arm32-arm64/scripts/entry.sh
View File

@ -1,4 +1,6 @@
#!/bin/sh #!/bin/sh
set -e
trap exit INT TERM trap exit INT TERM
/build.sh & /build.sh &
wait $! wait $!

3
builds/docker/linux/x86-x64/Dockerfile
View File

@ -7,7 +7,7 @@ ARG ARG_CTNG_VERSION=1.25.0
ARG ARG_LIBTOOL_VERSION=2.4.6 ARG ARG_LIBTOOL_VERSION=2.4.6
ARG ARG_NCURSES_VERSION=6.3 ARG ARG_NCURSES_VERSION=6.3
ARG ARG_LTM_VERSION=1.2.0 ARG ARG_LTM_VERSION=1.2.0
ARG ARG_ZLIB_VERSION=1.2.12 ARG ARG_ZLIB_VERSION=1.2.13
ARG ARG_ICU_VERSION=70-1 ARG ARG_ICU_VERSION=70-1
ARG ARG_CPUCOUNT=6 ARG ARG_CPUCOUNT=6
@ -201,6 +201,7 @@ ARG ARG_CTNG_GID
RUN apt-get update && \ RUN apt-get update && \
apt-get -y install \ apt-get -y install \
cmake \
libfile-copy-recursive-perl \ libfile-copy-recursive-perl \
unzip && \ unzip && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

1
builds/docker/linux/x86-x64/build-x64.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
docker build \ docker build \
--pull \
--build-arg ARG_BASE=ubuntu:22.04 \ --build-arg ARG_BASE=ubuntu:22.04 \
--build-arg ARG_SET_ARCH=x86_64 \ --build-arg ARG_SET_ARCH=x86_64 \
--build-arg ARG_TARGET_ARCH=x86_64-pc-linux-gnu \ --build-arg ARG_TARGET_ARCH=x86_64-pc-linux-gnu \

1
builds/docker/linux/x86-x64/build-x86.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
docker build \ docker build \
--pull \
--build-arg ARG_BASE=i386/ubuntu:18.04 \ --build-arg ARG_BASE=i386/ubuntu:18.04 \
--build-arg ARG_SET_ARCH=i686 \ --build-arg ARG_SET_ARCH=i686 \
--build-arg ARG_TARGET_ARCH=i586-pc-linux-gnu \ --build-arg ARG_TARGET_ARCH=i586-pc-linux-gnu \

4
builds/docker/linux/x86-x64/crosstool-ng-config-x64
View File

@ -814,8 +814,8 @@ CT_ZLIB_PKG_NAME="zlib"
CT_ZLIB_SRC_RELEASE=y CT_ZLIB_SRC_RELEASE=y
# CT_ZLIB_SRC_DEVEL is not set # CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_PATCH_ORDER="global"
CT_ZLIB_V_1_2_12=y CT_ZLIB_V_1_2_13=y
CT_ZLIB_VERSION="1.2.12" CT_ZLIB_VERSION="1.2.13"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

4
builds/docker/linux/x86-x64/crosstool-ng-config-x86
View File

@ -814,8 +814,8 @@ CT_ZLIB_PKG_NAME="zlib"
CT_ZLIB_SRC_RELEASE=y CT_ZLIB_SRC_RELEASE=y
# CT_ZLIB_SRC_DEVEL is not set # CT_ZLIB_SRC_DEVEL is not set
CT_ZLIB_PATCH_ORDER="global" CT_ZLIB_PATCH_ORDER="global"
CT_ZLIB_V_1_2_12=y CT_ZLIB_V_1_2_13=y
CT_ZLIB_VERSION="1.2.12" CT_ZLIB_VERSION="1.2.13"
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/" CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

1
builds/docker/linux/x86-x64/scripts/build.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
./autogen.sh \ ./autogen.sh \
--host=$BUILD_ARCH \ --host=$BUILD_ARCH \

2
builds/docker/linux/x86-x64/scripts/entry.sh
View File

@ -1,4 +1,6 @@
#!/bin/sh #!/bin/sh
set -e
trap exit INT TERM trap exit INT TERM
setarch $SET_ARCH /build.sh & setarch $SET_ARCH /build.sh &
wait $! wait $!

2
builds/posix/Makefile.in
View File

@ -303,7 +303,7 @@ $(RE2_LIB): $(RE2_Objs)
libcds: libcds:
mkdir -p $(LIBCDS)/lib/$(TARGET) mkdir -p $(LIBCDS)/lib/$(TARGET)
cd $(LIBCDS)/lib/$(TARGET); \ cd $(LIBCDS)/lib/$(TARGET); \
cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS) cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS)
AR="$(AR)" $(MAKE) -C $(LIBCDS)/lib/$(TARGET) AR="$(AR)" $(MAKE) -C $(LIBCDS)/lib/$(TARGET)
ifeq ($(TARGET),Debug) ifeq ($(TARGET),Debug)