Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
editors/openoffice-*: Unbreak build on 15.0-CURRENT
Revert "editors/openoffice-*: Unbreak build on 15.0-CURRENT" Undo the switch to llvm from ports. This reverts commit f25b169. Instead, pass --undefined-version to the linker to avoid the build breakage on -CURRENT by the change to the default value for this switch. Tidy up LIB_DEPENDS.
- Loading branch information
1 parent
1d72d71
commit 21c8a01
Showing
6 changed files
with
48 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- solenv/inc/unxfbsd.mk.orig 2021-04-02 12:58:22 UTC | ||
+++ solenv/inc/unxfbsd.mk | ||
@@ -176,7 +176,7 @@ LINKFLAGSRUNPATH_NONE= | ||
LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' | ||
#LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' | ||
LINKFLAGSRUNPATH_NONE= | ||
-LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) | ||
+LINKFLAGS=-Wl,-z,combreloc -Wl,--undefined-version $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) | ||
|
||
# linker flags for linking applications | ||
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- solenv/gbuild/platform/freebsd.mk.orig 2019-09-17 22:55:21 UTC | ||
+++ solenv/gbuild/platform/freebsd.mk | ||
@@ -125,6 +125,7 @@ gb_LinkTarget_LDFLAGS += \ | ||
-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ | ||
-Wl,-z,combreloc \ | ||
-Wl,-z,defs \ | ||
+ -Wl,--undefined-version \ | ||
$(subst -L../lib , ,$(SOLARLIB)) \ | ||
${FBSD_GCC_RPATH} \ | ||
\ |
11 changes: 11 additions & 0 deletions
11
editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- solenv/inc/unxfbsd.mk.orig 2019-09-17 22:55:21 UTC | ||
+++ solenv/inc/unxfbsd.mk | ||
@@ -173,7 +173,7 @@ LINKFLAGSRUNPATH_NONE= | ||
LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' | ||
#LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' | ||
LINKFLAGSRUNPATH_NONE= | ||
-LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) | ||
+LINKFLAGS=-Wl,-z,combreloc -Wl,--undefined-version $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) | ||
|
||
# linker flags for linking applications | ||
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ |