This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1d36aa0 When building icu on FreeBSD with ports gcc, use the rpath to
find libstdc++.
1d36aa0 is described below
commit 1d36aa0df1278425e9b61485862a22aa6631ea9e
Author: Don Lewis <[email protected]>
AuthorDate: Sat Nov 16 21:03:49 2019 -0800
When building icu on FreeBSD with ports gcc, use the rpath to find
libstdc++.
This many only be needed with gcc is installed with a non-default PREFIX
and/or ldconifig is not run on that directory.
---
main/icu/makefile.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk
index 72e2230..36fb05d 100644
--- a/main/icu/makefile.mk
+++ b/main/icu/makefile.mk
@@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both
LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new
-Wl,--dynamic-list-cpp-typeinfo
.ENDIF
+# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++
+.IF "$(OS)"=="FREEBSD"
+LDFLAGSADD+=$(FBSD_GCC_RPATH)
+.ENDIF
+
CONFIGURE_DIR=source
CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)"
LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout
--enable-static --enable-shared=yes $(DISABLE_64BIT)'
