-
Notifications
You must be signed in to change notification settings - Fork 728
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Submitter becomes maintainer - Update options - Bypass broken readline detection by cmake - Add test target ChangeLog: https://www.hatari.tuxfamily.org/news.html PR: 278590
- Loading branch information
1 parent
903a740
commit 8580a08
Showing
7 changed files
with
113 additions
and
89 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1645876638 | ||
| SHA256 (hatari-2.3.1.tar.bz2) = 44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd | ||
| SIZE (hatari-2.3.1.tar.bz2) = 4334129 | ||
| TIMESTAMP = 1714071173 | ||
| SHA256 (hatari-2.5.0.tar.bz2) = d76c22fc3de69fb1bb4af3e8ba500b7e40f5a2a45d07783f24cb7101e53c3457 | ||
| SIZE (hatari-2.5.0.tar.bz2) = 2820580 |
This file was deleted.
Oops, something went wrong.
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,17 @@ | ||
| --- cmake/FindReadline.cmake.orig 2024-04-30 09:37:41 UTC | ||
| +++ cmake/FindReadline.cmake | ||
| @@ -19,9 +19,11 @@ if(Readline_FOUND) | ||
| if(Readline_FOUND) | ||
| set(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY}) | ||
| set(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR}) | ||
| - check_symbol_exists(rl_filename_completion_function | ||
| - "stdio.h;readline.h" | ||
| - HAVE_RL_COMPLETION_FUNCTION) | ||
| + # check_symbol_exists faile for readline on FreeBSD. Bypassing | ||
| + set(HAVE_RL_COMPLETION_FUNCTION TRUE) | ||
| + #check_symbol_exists(rl_filename_completion_function | ||
| + # "stdio.h;readline.h" | ||
| + # HAVE_RL_COMPLETION_FUNCTION) | ||
| # If linking did not work, we might have to link | ||
| # explicitly against libtermcap or libncurses | ||
| if(NOT HAVE_RL_COMPLETION_FUNCTION) |
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 |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| --- tools/atari-hd-image.sh.orig 2022-02-26 12:11:11 UTC | ||
| --- tools/atari-hd-image.sh.orig 2024-04-26 10:23:56 UTC | ||
| +++ tools/atari-hd-image.sh | ||
| @@ -33,8 +33,8 @@ PATH=/sbin:$PATH | ||
| @@ -33,8 +33,8 @@ export PATH | ||
| export PATH | ||
|
|
||
| # check tools | ||
| -if [ -z "$(which mkdosfs)" ] || [ -z "$(which python)" ]; then | ||
| - echo "ERROR: either mkdosfs or python tool missing!" | ||
| -if [ -z "$(which mkdosfs)" ] || [ -z "$(which python3)" ]; then | ||
| - echo "ERROR: either mkdosfs or python3 missing!" | ||
| +if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then | ||
| + echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% tool missing!" | ||
| + echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!" | ||
| exit 1 | ||
| fi | ||
|
|
||
| @@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Record / partition | ||
| # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector | ||
| # For DOS MBR, the values are little endian. | ||
| # ----------- | ||
| -python << EOF | ||
| -python3 << EOF | ||
| -#!/usr/bin/env python3 | ||
| +%%PYTHON_VERSION%% << EOF | ||
| +#!/usr/bin/env %%PYTHON_VERSION%%3 | ||
| +#!/usr/bin/env %%PYTHON_VERSION%% | ||
| mbr = bytearray(512) | ||
| def set_long(idx, value): |
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