Skip to content

macOS-12 CI/CD failure fix, periodic CMake regenerate#398

Merged
pkoning2 merged 2 commits intoopen-simh:masterfrom
bscottm:master
Jun 28, 2024
Merged

macOS-12 CI/CD failure fix, periodic CMake regenerate#398
pkoning2 merged 2 commits intoopen-simh:masterfrom
bscottm:master

Conversation

@bscottm
Copy link
Copy Markdown
Contributor

@bscottm bscottm commented Jun 24, 2024

  • zlib now needs to be an explicit HomeBrew dependency. Previously, Apple distributed zlib as part of macOS. That is no longer the case.

  • CMake: Periodic generate.py to update simulator CMakeLists.txt build files.

  • PDP-10: Not entirely clear to me how/when AIO_CCFLAGS went missing (which causes generate.py to add USES_AIO to the CMake add_simulator arguments. Without AIO, the PDP-10 simulator users get a warning message with respect to AIO and networking.

bscottm added 2 commits June 23, 2024 23:10
Zlib is no longer packaged as part of macOS, now needs to be installed
by HomeBrew.
- Periodic "python cmake/generate.py" to sync with makefile changes.

- Ensure that AIO_CCDEFS (makefile) and USES_AIO (CMake generate.py) are
  present for PDP-10 simulators. Otherwise, user gets a warning message
  when the simulator starts about network support and asynchronous I/O.
@markpizz
Copy link
Copy Markdown
Contributor

@bscottm Nice way to slip in your previously discussed and still open cross thread interference changes. See discussion details in that original PR.

@bscottm
Copy link
Copy Markdown
Contributor Author

bscottm commented Jun 24, 2024

@markpizz: ??? No clue what you're talking about.

@markpizz
Copy link
Copy Markdown
Contributor

@markpizz: ??? No clue what you're talking about.

Well, I got a email with these contents:

@bscottm pushed 3 commits.
dfb6194 MAKEFILE: Add zlib to macOS deps
6aa60d8 CMAKE: Regenerate, PDP10 needs USES_AIO
0998e63 SCP: Fix scp_asynch_check cross-thread interference

View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.

I opened a browser to github.com/open-simh/simh and selected this PR in the Pull Requests and composed my comment.

Ahh, I now see that the subject on the above message was actually due to you had pushing the changes in this PR to your prior PR. Sorry for any confusion.

I'm not sure you should be mixing commits between different PRs though...

@bscottm
Copy link
Copy Markdown
Contributor Author

bscottm commented Jun 24, 2024

@markpizz: There are only two commits here, both related to the build system (makefile and CMake). There's nothing from my scp-async-check branch. You may have seen activity on my other branches when I updated my repo to sync with open-simh/master on several branches.

@bscottm bscottm mentioned this pull request Jun 25, 2024
@deltecent
Copy link
Copy Markdown
Contributor

Nice work.

@pkoning2 pkoning2 merged commit 103d1dd into open-simh:master Jun 28, 2024
@markpizz markpizz mentioned this pull request Mar 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants