Hello,

I repaired SLZ build.


it used to work earlier because of SSL_LIB, SSL_INC variables.

чт, 30 июл. 2020 г. в 16:14, Илья Шипицин <[email protected]>:

> SLZ also copied lib and headers to ${HOME}/opt
>
>
> I do not want to use SSL_INC, SSL_LIB for SLZ.
> I will send patch tomorrow (or earlier)
>
> чт, 30 июл. 2020 г. в 07:48, Willy Tarreau <[email protected]>:
>
>> Hi Ilya,
>>
>> thanks for this. Two minor comments (just let me know, I can adjust
>> the patches before merging them if you confirm):
>>
>> >    - os: linux
>> >      if: type == cron
>> >      compiler: clang
>> >      env: TARGET=linux-glibc LIBRESSL_VERSION=2.9.2
>> EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" CC=clang-9
>> > +    name: libressl-2.9.2 | prometheus-exporte
>>
>> I guess this was "prometheus-exporter" above (missing "r") ?
>>
>> > -  - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET
>> $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS"
>> ADDLIB="-Wl,-rpath,$SSL_LIB" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC"
>> EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS
>> > +  - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET
>> $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" $([ ! -z
>> ${SSL_LIB+x} ] && echo ADDLIB="-Wl,-rpath,$SSL_LIB")
>> 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS
>>
>> I did not notice this "-j3", shouldn't we use "-j$(nproc)" instead so
>> that we use all CPUs made available to us ?
>>
>> Willy
>>
>
From 01cdfc7756377624af7c3f04da5e758481f03515 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <[email protected]>
Date: Fri, 31 Jul 2020 02:05:55 +0500
Subject: [PATCH 1/2] CI: travis-ci: use better name for Coverity scan job

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7ff035472..2d2a027ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ matrix:
           make -C contrib/wurfl
           curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"; | bash || true
         fi
-    name: openssl-1.1.1
+    name: Coverity scan | openssl-1.1.1
   - os: linux
     if: type == cron
     compiler: clang
-- 
2.26.2

From 787278ea33b715f15a930fc2ab019e52fcdb2003 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <[email protected]>
Date: Fri, 31 Jul 2020 02:08:13 +0500
Subject: [PATCH 2/2] CI: travis-ci: use proper linking flags for SLZ build

previously SSL_INC and SSL_INC were set for all builds, and SLZ lib
was linked because of those flags. After we switched SLZ build to
stock openssl lib, SSL_INC, SSL_LIB are not set anymore.

Good time to set SLZ_INC, SLZ_LIB for such builds
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2d2a027ce..ca6073ee7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,6 +110,8 @@ matrix:
     before_script:
       - git clone https://github.com/wtarreau/libslz
       - cd libslz && make && make PREFIX=${HOME}/opt install && cd ..
+      - export SLZ_INC=${HOME}/opt/include SLZ_LIB=${HOME}/opt/lib
+      - export ADDLIB="-Wl,-rpath,$SLZ_LIB"
     name: openssl-1.1.1 | slz | pcre2
   allow_failures:
   - os: linux
@@ -125,12 +127,13 @@ install:
     if [ ! -z ${OPENSSL_VERSION+x} ] || [ ! -z ${LIBRESSL_VERSION+x} ] || [ ! -z ${BORINGSSL+x} ]; then
        travis_wait bash -c 'scripts/build-ssl.sh >build-ssl.log 2>&1' || (cat build-ssl.log && exit 1)
        export SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include
+       export ADDLIB="-Wl,-rpath,$SSL_LIB"
     fi
 
 script:
   - if [ "${CC%-*}"  = "clang" ]; then export FLAGS="$FLAGS USE_OBSOLETE_LINKER=1" DEBUG_CFLAGS="-g -fsanitize=address" LDFLAGS="-fsanitize=address"; fi
   - make -C contrib/wurfl
-  - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" $([ ! -z ${SSL_LIB+x} ] && echo ADDLIB="-Wl,-rpath,$SSL_LIB") 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS
+  - make -j3 CC=$CC CPU_CFLAGS.generic="-O1" V=1 ERR=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS" ADDLIB="$ADDLIB" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" $DEBUG_OPTIONS
   - ./haproxy -vv
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd haproxy; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L haproxy; fi
-- 
2.26.2

Reply via email to