Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix solaris patch issue #1793

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions config/patches/libxslt/libxslt-sol-config-1.1.37.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- libxslt-1.1.37/configure.in 2023-04-28 15:36:02
+++ libxslt-1.1.37/configure 2023-04-28 15:36:24
@@ -14478,11 +14478,11 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to pass version script to the linker ($LD)" >&5
printf %s "checking how to pass version script to the linker ($LD)... " >&6; }
VERSION_SCRIPT_FLAGS=none
-#if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then
-# VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-#elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then
-# VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
-#fi
+if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then
+ VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then
+ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VERSION_SCRIPT_FLAGS" >&5
printf "%s\n" "$VERSION_SCRIPT_FLAGS" >&6; }

8 changes: 5 additions & 3 deletions config/software/libxslt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@
update_config_guess

env = with_standard_compiler_flags(with_embedded_path)

patch source: "libxslt-solaris-configure.patch", env: env if solaris2? || omnios? || smartos?

if version.satisfies?(">= 1.1.37")
patch source: "libxslt-sol-config-1.1.37.patch", env: env if solaris2? || omnios? || smartos?
else
patch source: "libxslt-solaris-configure.patch", env: env if solaris2? || omnios? || smartos?
end
if windows?
patch source: "libxslt-windows-relocate.patch", env: env
end
Expand Down