generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-24 02:51:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1692 from Kampbell/honor-export-CXX-g++-4.8

Browse Source 
Honor export cxx g++ 4.8
This commit is contained in:
Günter Obiltschnig 2017-06-02 18:27:40 +02:00 committed by GitHub
commit bcd148281f
7 changed files with 90 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
.travis.yml
View File

@ -28,6 +28,9 @@ services:
- postgresql - postgresql
- mysql - mysql
dist: trusty
sudo: required
addons: addons:
postgresql: "9.3" postgresql: "9.3"
@ -54,95 +57,118 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- env: TEST_NAME="OSX clang (make) bundled" - env: TEST_NAME="clang (make) bundled"
os: osx os: osx
compiler: clang compiler: clang
script: script:
- export CC="clang" - export CC="clang"
- export CXX="clang++" - export CXX="clang++"
- $CXX --version
- clang++ -x c++ /dev/null -dM -E - clang++ -x c++ /dev/null -dM -E
- ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh
- env: TEST_NAME="Linux gcc 4.6 (make) bundled" - env: TEST_NAME="clang (make) bundled"
compiler: gcc
script:
- export CC="gcc"
- export CXX="g++"
- ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="Linux gcc 4.8 (make) bundled"
compiler: gcc
script:
- export CC="gcc-4.8"
- export CXX="g++-4.8"
- ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="Linux gcc 4.6 (make) unbundled"
compiler: gcc
script:
- export CC="gcc"
- export CXX="g++"
- sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
- ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="Linux gcc 4.8 (make) unbundled"
compiler: gcc
script:
- sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
- export CC="gcc-4.8"
- export CXX="g++-4.8"
- ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="Linux clang 3.4 (make)"
compiler: clang compiler: clang
script: script:
- ./configure --everything --config=Linux-clang && make -s -j2 && ./travis/Linux/runtests.sh - sudo apt-get install -qq -y clang
- export CC="clang"
- export CXX="clang++"
- $CXX --version
- sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
- ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="Linux arm-linux-gnueabi- (make)" - env: TEST_NAME="clang (make) unbundled"
compiler: clang
script:
- sudo apt-get install -qq -y clang
- export CC="clang"
- export CXX="clang++"
- $CXX --version
- ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="gcc 4.6 (make) bundled"
compiler: gcc
script:
- export CC="gcc"
- export CXX="g++"
- $CXX --version
- ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="gcc 4.6 (make) unbundled"
compiler: gcc
script:
- export CC="gcc"
- export CXX="g++"
- $CXX --version
- sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
- ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="gcc 4.8 (make) bundled"
compiler: gcc
script:
- export CC="gcc-4.8"
- export CXX="g++-4.8"
- $CXX --version
- ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="gcc 4.8 (make) unbundled"
compiler: gcc
script:
- sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
- export CC="gcc-4.8"
- export CXX="g++-4.8"
- $CXX --version
- ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
- env: TEST_NAME="arm-linux-gnueabi- (make)"
compiler: gcc compiler: gcc
script: script:
- ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l
- env: TEST_NAME="Linux gcc 4.6 (CMake)" - env: TEST_NAME="gcc 4.6 (CMake)"
compiler: gcc compiler: gcc
script: script:
- export CC="gcc" - export CC="gcc"
- export CXX="g++" - export CXX="g++"
- $CXX --version
- source ./travis/ignored.sh - source ./travis/ignored.sh
- export POCO_BASE=`pwd` - export POCO_BASE=`pwd`
- mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd ..
- env: TEST_NAME="Linux gcc 4.8 (CMake)" - env: TEST_NAME="gcc 4.8 (CMake)"
compiler: gcc compiler: gcc
script: script:
- export CC="gcc-4.8" - export CC="gcc-4.8"
- export CXX="g++-4.8" - export CXX="g++-4.8"
- $CXX --version
- source ./travis/ignored.sh - source ./travis/ignored.sh
- export POCO_BASE=`pwd` - export POCO_BASE=`pwd`
- mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd ..
- env: TEST_NAME="Linux clang 3.4 (CMake)" - env: TEST_NAME="clang 3.4 (CMake)"
compiler: clang compiler: clang
script: script:
- source ./travis/ignored.sh - source ./travis/ignored.sh
- export POCO_BASE=`pwd` - export POCO_BASE=`pwd`
- mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd ..
- env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" - env: TEST_NAME="arm-linux-gnueabi-g++ (CMake)"
compiler: gcc compiler: gcc
script: script:
- export CC="arm-linux-gnueabi-gcc" - export CC="arm-linux-gnueabi-gcc"
- export CXX="arm-linux-gnueabi-g++" - export CXX="arm-linux-gnueabi-g++"
- $CXX --version
- source ./travis/ignored.sh - source ./travis/ignored.sh
- export POCO_BASE=`pwd` - export POCO_BASE=`pwd`
- mkdir cmake-build - mkdir cmake-build
- cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd ..
- env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" - env: TEST_NAME="arm-linux-gnueabihf-g++ (CMake)"
compiler: gcc compiler: gcc
script: script:
- export CC="arm-linux-gnueabihf-gcc" - export CC="arm-linux-gnueabihf-gcc"
- export CXX="arm-linux-gnueabihf-g++" - export CXX="arm-linux-gnueabihf-g++"
- $CXX --version
- source ./travis/ignored.sh - source ./travis/ignored.sh
- export POCO_BASE=`pwd` - export POCO_BASE=`pwd`
- mkdir cmake-build - mkdir cmake-build
@ -151,11 +177,12 @@ matrix:
# QA jobs for code analytics and metrics # QA jobs for code analytics and metrics
# build documentation and release # build documentation and release
- env: TEST_NAME="Linux documentation & release" - env: TEST_NAME="documentation & release"
compiler: gcc compiler: gcc
script: script:
- export CC="gcc" - export CC="gcc-4.8"
- export CXX="g++" - export CXX="g++-4.8"
- $CXX --version
- . env.sh && mkdoc all && mkrel all - . env.sh && mkdoc all && mkrel all
# static code analysis with cppcheck (we can add --enable=all later) # static code analysis with cppcheck (we can add --enable=all later)

1
Foundation/Makefile
View File

@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
ifdef POCO_UNBUNDLED ifdef POCO_UNBUNDLED
SYSLIBS += -lpcre -lz SYSLIBS += -lpcre -lz
objects += $(pcre_utf8_objects)
else else
objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
endif endif

4
PageCompiler/File2Page/Makefile
View File

@ -10,10 +10,6 @@ include $(POCO_BASE)/build/rules/global
objects = File2Page objects = File2Page
ifdef POCO_UNBUNDLED
SYSLIBS += -lz -lpcre -lexpat
endif
target = f2cpsp target = f2cpsp
target_version = 1 target_version = 1
target_libs = PocoUtil PocoXML PocoJSON PocoFoundation target_libs = PocoUtil PocoXML PocoJSON PocoFoundation

2
PocoDoc/cfg/mkdoc-poco.xml
View File

@ -44,7 +44,7 @@
${PocoBuild}/*/doc/images ${PocoBuild}/*/doc/images
</resources> </resources>
<compiler> <compiler>
<exec>g++</exec> <exec>${CXX}</exec>
<options> <options>
${Includes}, ${Includes},
-I/usr/local/mysql/include, -I/usr/local/mysql/include,

2
PocoDoc/cfg/mkdocumentation.xml
View File

@ -41,7 +41,7 @@
${PocoBuild}/*/doc/images ${PocoBuild}/*/doc/images
</resources> </resources>
<compiler> <compiler>
<exec>g++</exec> <exec>${CXX}</exec>
<options> <options>
${Includes}, ${Includes},
-I/usr/local/mysql/include, -I/usr/local/mysql/include,

12
build/config/Linux
View File

@ -15,14 +15,22 @@ LINKMODE ?= SHARED
# #
# Define Tools # Define Tools
# #
ifeq ($(origin CROSS_COMPILE), undefined)
CC ?=gcc
CXX ?=g++
LIB = ar -cr
RANLIB = ranlib
STRIP = strip
else
CC = ${CROSS_COMPILE}gcc CC = ${CROSS_COMPILE}gcc
CXX = ${CROSS_COMPILE}g++ CXX = ${CROSS_COMPILE}g++
LINK = $(CXX)
LIB = ${CROSS_COMPILE}ar -cr LIB = ${CROSS_COMPILE}ar -cr
RANLIB = ${CROSS_COMPILE}ranlib RANLIB = ${CROSS_COMPILE}ranlib
STRIP = ${CROSS_COMPILE}strip
endif
LINK = $(CXX)
SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = ${CROSS_COMPILE}strip
DEP = $(POCO_BASE)/build/script/makedepend.gcc DEP = $(POCO_BASE)/build/script/makedepend.gcc
SHELL = sh SHELL = sh
RM = rm -rf RM = rm -rf

5
release/script/mkdocumentation
View File

@ -117,6 +117,11 @@ for inc in `find $build -name include -print` ; do
includes="$includes,-I$inc" includes="$includes,-I$inc"
done done
: ${CC:=gcc}
: ${CXX:=g++}
echo "CC=$CC" >>$build/PocoDoc.ini
echo "CXX=$CXX" >>$build/PocoDoc.ini
echo "PocoBuild=$build" >>$build/PocoDoc.ini echo "PocoBuild=$build" >>$build/PocoDoc.ini
echo "PocoBase=$POCO_BASE" >>$build/PocoDoc.ini echo "PocoBase=$POCO_BASE" >>$build/PocoDoc.ini
echo "PocoDoc.output=$docPath" >>$build/PocoDoc.ini echo "PocoDoc.output=$docPath" >>$build/PocoDoc.ini