[couchdb] branch main updated: chore: configurable ICU locations

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new 46d585e6f chore: configurable ICU locations
46d585e6f is described below

commit 46d585e6fac4728fc8f7b4bdc6b24ddb0a57b526
Author: Johannes Jörg Schmidt <sc...@pm.me>
AuthorDate: Mon Nov 28 18:56:48 2022 +0100

    chore: configurable ICU locations
    
    add `LDFLAGS` and `CFLAGS` environment variables to `IcuEnv` in rebar
    config to be able to configure ICU includes and object paths via
    environment variable without having to patch `rebar.config.script`.
---
 src/couch/rebar.config.script | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 8d6d7d559..f0b465135 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -190,7 +190,9 @@ CouchJSEnv = case SMVsn of
 end.
 
 IcuEnv = [{"DRV_CFLAGS",  "$DRV_CFLAGS -DPIC -O2 -fno-common"},
-          {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}].
+          {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"},
+          {"LDFLAGS", "$LDFLAGS"},
+          {"CFLAGS", "$CFLAGS"}].
 IcuDarwinEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/opt/icu4c/include -I/opt/homebrew/opt/icu4c/include"},
                 {"LDFLAGS", "-L/usr/local/opt/icu4c/lib -L/opt/homebrew/opt/icu4c/lib"}].
 IcuBsdEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/include"},