This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cdd63492ba8ea1c06e96d4b16c9f4a88388ac370 Author: Jim Jagielski <[email protected]> AuthorDate: Thu Aug 6 13:27:02 2026 -0400 curl: fix macOS bundled-openssl linker flags and dylib naming --- main/curl/makefile.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk index d396ae4820..7bff8fcfcb 100644 --- a/main/curl/makefile.mk +++ b/main/curl/makefile.mk @@ -60,7 +60,12 @@ ssl_param=--with-ssl .ELSE ssl_param=--with-ssl=$(OUTDIR) curl_CFLAGS+=-I$(SOLARINCDIR)$/external +# -z origin/-rpath $ORIGIN are Linux/ELF idioms; Apple's ld rejects both. +.IF "$(OS)"!="MACOSX" curl_LDFLAGS+=-L$(SOLARLIBDIR) -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN +.ELSE +curl_LDFLAGS+=-L$(SOLARLIBDIR) +.ENDIF PATCH_FILES+= curl-bundled_openssl.patch .ENDIF @@ -73,7 +78,12 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) +.IF "$(OS)"=="MACOSX" +# libtool names macOS dylibs libcurl.<major>.dylib, not libcurl.dylib.<major>. +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.*.dylib +.ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 +.ENDIF .ENDIF # "$(GUI)"=="UNX"
