This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit bdb58f77c33385d4dedb03ed021452db7dccc009 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 b37578d..20c8180 100644 --- a/main/icu/makefile.mk +++ b/main/icu/makefile.mk @@ -85,6 +85,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)'
