-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
ngspice: fix the port for < 10.8 #25537
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
327bf8b
ngspice: fix compiler choice: it needs C/C++11
barracuda156 6705471
ngspice: do not hardcode arch flags
barracuda156 1e1ce50
ngspice: restore accidentally dropped patch
barracuda156 40c1fe1
ngspice: fix libKLU bug
barracuda156 c626ce1
ngspice: non-functional: alignment to multiple of 4 spaces
barracuda156 36eb2ad
ngspice: fix broken linking, finally
barracuda156 d8dbc8d
ngspice: remove unneeded build flags
markemer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- src/Makefile.in 2024-07-13 01:09:10.000000000 +0800 | ||
+++ src/Makefile.in 2024-08-31 13:25:22.000000000 +0800 | ||
@@ -875,7 +875,8 @@ | ||
-e 's|@XSPICEINIT[@]|$(XSPICEINIT)|g' \ | ||
-e 's|@pkglibdir[@]|$(spinitpath)|g' | ||
|
||
-AM_CFLAGS = -static | ||
+# MacOS linker does not need this. | ||
+# AM_CFLAGS = -static | ||
CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl | ||
MAINTAINERCLEANFILES = Makefile.in | ||
@SHARED_MODULE_TRUE@lib_LTLIBRARIES = libngspice.la |
17 changes: 17 additions & 0 deletions
17
science/ngspice/files/patch-ngspice-older-MACH-defines.diff
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 @@ | ||
--- src/frontend/get_resident_set_size.c.orig 2020-12-22 17:35:59.000000000 -0800 | ||
+++ src/frontend/get_resident_set_size.c 2020-12-22 17:39:53.000000000 -0800 | ||
@@ -110,6 +110,14 @@ | ||
return (unsigned long long) info.WorkingSetSize; | ||
|
||
#elif defined(__APPLE__) && defined(__MACH__) | ||
+ | ||
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080 | ||
+# define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT | ||
+# define mach_task_basic_info_data_t task_basic_info_data_t | ||
+# define MACH_TASK_BASIC_INFO TASK_BASIC_INFO | ||
+# define mach_task_basic_info task_basic_info | ||
+#endif | ||
+ | ||
/* OSX ------------------------------------------------------ */ | ||
struct mach_task_basic_info info; | ||
mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; |
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 @@ | ||
--- src/Makefile.in 2024-07-13 01:09:10.000000000 +0800 | ||
+++ src/Makefile.in 2024-08-31 14:02:16.000000000 +0800 | ||
@@ -482,7 +482,7 @@ | ||
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
am__v_CC_0 = @echo " CC " $@; | ||
am__v_CC_1 = | ||
-CCLD = $(CC) | ||
+CCLD = $(CXX) | ||
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
$(AM_LDFLAGS) $(LDFLAGS) -o $@ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this might be a weird old leftover, ngspice goes all the way back to SPICE3 essentially.