From: Joe Orton <jorton@apache.org>
Date: Wed, 26 Feb 2020 09:00:43 +0000 (+0000)
Subject: Add an i386 build using a multilib packages and "gcc -m32".
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ecd09cfac6849d645a6ec2265563e4ba962049;p=thirdparty%2Fapache%2Fhttpd.git

Add an i386 build using a multilib packages and "gcc -m32".
(All other Travis builds are 64-bit arches currently)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874542 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index ce91188dd06..89a3dfc2685 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,31 @@ matrix:
       env: CONFIG="--enable-mods-shared=reallyall"
            TEST_ARGS="-v"
     # -------------------------------------------------------------------------
+    - name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror
+      env: CONFIG="--enable-mods-shared=reallyall --disable-xml2enc --disable-proxy-html --enable-mpms-shared=all --enable-maintainer-mode"
+           PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+           NOTEST_CFLAGS="-Werror"
+           CC="gcc -m32"
+           APR_VERSION=1.7.0
+           APU_VERSION=1.6.1 APU_CONFIG="--with-crypto"
+      addons:
+        apt:
+          sources:
+            - sourceline: 'deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe'
+          packages:
+            - cpanminus
+            - libc6-dev-i386
+            - gcc-multilib
+            - libexpat1-dev:i386
+            - libssl-dev:i386
+            - lib32z1-dev
+            - libbrotli-dev:i386
+            - libpcre2-dev:i386
+            - libtool-bin
+            - perl-doc
+            - libapr1-dev
+            - libbrotli-dev:i386
+    # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Default, all-modules
       env: CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
@@ -197,10 +222,13 @@ matrix:
       env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
            CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1
 
+# CPAN modules are to be used with the system Perl and always with
+# CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct
+# otherwise.
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
         cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib);
-        cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI;
+        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI;
     fi
 
 before_script: