From c5f1a66ecda574ea48f4e891f34a2d546043228e Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 21 Sep 2021 14:01:58 +0200 Subject: [PATCH] rsyslog: fix build - fixed SRCURL for libestr - add include path --- rsyslog.be0 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/rsyslog.be0 b/rsyslog.be0 index 280d70dc6..1b564f881 100755 --- a/rsyslog.be0 +++ b/rsyslog.be0 @@ -1,12 +1,12 @@ #!/bin/env beesh -# BEE_VERSION rsyslog-6.1.2-1 +# BEE_VERSION rsyslog-6.1.2-2 # SRCURL[0]="http://www.rsyslog.com/files/download/rsyslog/rsyslog-6.1.2.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/82a0ff460663fcfbfb6fccce30e0d7e8/rsyslog-6.1.2.tar.gz" # SRCURL[1]="https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz" -SRCURL[1]="https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz" +SRCURL[1]="https://beehive.molgen.mpg.de/1f25a2332750d4bfacfb314235fedff0/libestr-0.1.11.tar.gz" # SRCURL[2]="http://www.libee.org/files/download/libee-0.4.1.tar.gz" SRCURL[2]="https://beehive.molgen.mpg.de/7bbf4160876c12db6193c06e2badedb2/libee-0.4.1.tar.gz" @@ -20,14 +20,16 @@ SRCURL[2]="https://beehive.molgen.mpg.de/7bbf4160876c12db6193c06e2badedb2/libee- mee_configure() { # libestr.a - cd ${S}/libestr-0.1.11 + + export PKG_CONFIG_PATH+="${S}/libstatic/lib/pkgconfig" + + start_cmd cd ${S}/libestr-0.1.11 CFLAGS+=' -fPIC' CFLAGS=${CFLAGS} \ ./configure --prefix=${S}/libstatic --disable-shared make make install - PKG_CONFIG_PATH+="${S}/libstatic/lib/pkgconfig" # SILENCE! Infidel! CFLAGS+=' -Wno-implicit-fallthrough' @@ -39,15 +41,19 @@ mee_configure() { CFLAGS+=' -Wno-deprecated-declarations' # libee.a - cd ${S}/libee-0.4.1 + start_cmd cd ${S}/libee-0.4.1 + + CFLAGS=${CFLAGS} \ ./configure --prefix=${S}/libstatic --disable-shared make make install - cd ${S} + start_cmd cd ${S} - CFLAGS=${CFLAGS} \ + CFLAGS+=" -I${S}/libstatic/include" + + CFLAGS=${CFLAGS} \ LIBS=-L${S}/libstatic/lib \ LIBESTR_LIBS=-l:libestr.a \ LIBEEE_LIBS=-l:libee.a \