summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kazmin <a.kazmin@partner.samsung.com>2019-12-20 10:41:55 (GMT)
committerDongHun Kwak <dh0128.kwak@samsung.com>2020-01-14 08:10:04 (GMT)
commit9b579991b0f2b5a4496ea09e1993f79bb96d8704 (patch)
tree90785ecbee842fe879cee160ed2493a2fd903407
parentaa72804a385b69bf8f117bab4ec174f546655be9 (diff)
downloadboost-sandbox/backup/boost_1.65.1_20200128.zip
boost-sandbox/backup/boost_1.65.1_20200128.tar.gz
boost-sandbox/backup/boost_1.65.1_20200128.tar.bz2
Fixed arm 32-bit build on 64-bit host. Added missed environment flags to build with gcc. Change-Id: Id6e5530a0361acf7b711c044e536041fcb757429 Signed-off-by: Andrey Kazmin <a.kazmin@partner.samsung.com> Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r--packaging/boost.spec6
-rw-r--r--tools/build/src/engine/build.jam1
-rwxr-xr-xtools/build/src/engine/build.sh3
3 files changed, 10 insertions, 0 deletions
diff --git a/packaging/boost.spec b/packaging/boost.spec
index 9b8260c..99fe33f 100644
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -399,6 +399,12 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
find . -name \*.orig -exec rm {} +
%build
+
+%ifarch armv7l
+export CFLAGS="${CFLAGS} -Wp,-D_FILE_OFFSET_BITS=64"
+export CXXFLAGS="${CXXFLAGS} -Wp,-D_FILE_OFFSET_BITS=64"
+%endif
+
find . -type f -exec chmod u+w {} +
# Create shared build instructions
diff --git a/tools/build/src/engine/build.jam b/tools/build/src/engine/build.jam
index e711c08..15b5d48 100644
--- a/tools/build/src/engine/build.jam
+++ b/tools/build/src/engine/build.jam
@@ -216,6 +216,7 @@ toolset darwin cc : "-o " : -D
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
: -pedantic -fno-strict-aliasing
+ : $(CFLAGS)
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
[ opt --debug : -g -O0 -fno-inline ]
[ opt --profile : -O3 -g -pg ]
diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
index 1d0dcc8..10452e0 100755
--- a/tools/build/src/engine/build.sh
+++ b/tools/build/src/engine/build.sh
@@ -151,6 +151,9 @@ case $BOOST_JAM_TOOLSET in
*)
BOOST_JAM_CC=gcc
esac
+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
;;
darwin)