Skip to content

Fix sort command options #38

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.

Sign up for GitHub

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

Open
ur4t wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix sort command options #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edd8394
Fix sort command option display
ur4t Dec 23, 2025
74c504b
Update patch
ur4t Dec 23, 2025
124866e
Fix sort meson.build
ur4t Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/src.freebsd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6732,9 +6732,9 @@
#endif
"[--human-numeric-sort] "
+#ifndef WITHOUT_LIBCRYPTO
+ "[--version-sort]] "
+#else
"[--version-sort] [--random-sort [--random-source file]] "
+#else
+ "[--version-sort] "
+#endif
"[--compress-program program] [file ...]\n" };

Expand Down
5 changes: 4 additions & 1 deletion src.freebsd/coreutils/sort/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
sort_cargs = ['-DWITHOUT_NLS', '-DSORT_THREADS']
sort_deps = [libpthread]

if not libcrypto.found()
sort_cargs += ['-DWITHOUT_LIBCRYPTO']
else
sort_deps += [libcrypto]
endif

sort_srcs = [
Expand All @@ -12,7 +15,7 @@ sort_srcs = [
sort_prog = executable(
'sort', sort_srcs,
include_directories: [inc],
dependencies: [libcrypto, libpthread],
dependencies: sort_deps,
link_with: [libcompat],
c_args: sort_cargs,
install: true,
Expand Down
4 changes: 2 additions & 2 deletions src.freebsd/coreutils/sort/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ const char *nlsstr[] = { "",
#endif
"[--human-numeric-sort] "
#ifndef WITHOUT_LIBCRYPTO
"[--version-sort]] "
#else
"[--version-sort] [--random-sort [--random-source file]] "
#else
"[--version-sort] "
#endif
"[--compress-program program] [file ...]\n" };

Expand Down