Skip to content

Commit

Permalink
All ./configure files are now part of the OTP repository
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Jan 26, 2022
1 parent e5f622e commit 3a456b9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker/build-image-and-rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

usage() {
echo "parameters error"
echo "first: version, e.g. 'stream9' or '8' "
echo "first: version, e.g. '9' or '8' "
echo "second: --no-cache [optional]"
echo "es: ./build-image-and-rpm.sh '8' --no-cache"
exit 1
Expand Down
15 changes: 12 additions & 3 deletions docker/build-rpm-in-docker.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
#!/usr/bin/env bash

centos_version="$1"
build_dir="build-dir-$centos_version"
case $centos_version in
9)
centos_tag=stream9;;
*)
# 8 and 7
centos_tag="$centos_version";;
esac

# this has to match what Dockerfile uses
build_dir="build-dir-$centos_tag"
packages=("Makefile" "erlang.spec" "Erlang_ASL2_LICENSE.txt")

if [ -z "$centos_version" ]
then
echo "
Ops: parameters error
first: version, ex: 8 or 7
first: version, ex: 9 or 8
-----------------------------------------
Ex: ./build-rpm-in-docker.sh 9
Ex: ./build-rpm-in-docker.sh 8
Ex: ./build-rpm-in-docker.sh 7
"
exit 1
fi
Expand Down
3 changes: 0 additions & 3 deletions erlang.spec
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ chmod 644 lib/ssl/examples/src/Makefile
%global conf_flags --enable-shared-zlib --without-javac --without-odbc
%endif

# autoconf
./otp_build autoconf

%ifarch sparcv9 sparc64
CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure %{conf_flags}
%else
Expand Down

0 comments on commit 3a456b9

Please sign in to comment.