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.

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

Jump to bottom

Revise recipes for MacOS builds and general portability, and fix some AX_REALPATH_LIB aspects #2506

Merged
merged 41 commits into from
Jul 4, 2024
Merged

Revise recipes for MacOS builds and general portability, and fix some AX_REALPATH_LIB aspects #2506

merged 41 commits into from
Jul 4, 2024

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Jul 3, 2024 •
edited
Loading

Follows up from:

One discovery along the way was that net-snmp tends to be built against (and require) openssl headers.

jimklimov added 30 commits July 4, 2024 01:15
@jimklimov
.circleci/config.yml, docs/config-prereqs.txt: clarify dependencies a…
ab73103 
…vailable via Homebrew on MacOS [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
scripts/augeas/gen-nutupsconf-aug.py.in: mark regex strings as r"" [n…
3441725 
…etworkupstools#2183]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/nut_check_libregex.m4: AC_SEARCH_LIBS is for one method at a time
2638650 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/nut_check_libregex.m4: further simplify work with AC_SEARCH_LIBS
e0e7efd 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
configure.ac: revise use of AC_SEARCH_LIBS for i2c methods (one per c…
27a4703 
…all)

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: use HOMEBREW_PREFIX variable as already used by…
3133056 
… brew [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: set *FLAGS after detecting CI_OS_NAME nuances
9b2e710 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml, docs/config-prereqs.txt: install docbook-xsl an…
03c50f1 
…d document nuances around it

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: guess CI_CCACHE_SYMLINKDIR with HOMEBREW_PREFIX automati…
5d0bb5a 
…cally

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: inject pkg-config, libltdl and libsnmp settings with HOM…
8f72743 
…EBREW_PREFIX automatically

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: pass just HOMEBREW_PREFIX to ./ci_build.sh now,…
fede110 
… not customized paths anymore [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
NEWS.adoc: report changes about MacOS builds on NUT CI and interactiv…
905fdd7 
…ely [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/ax_c_pragmas.m4: introduce HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_UNUS…
fb7602d 
…ED_PARAMETER

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
drivers/snmp-ups.h, tools/nut-scanner/scan_snmp.c: use HAVE_PRAGMA_GC…
d0b137b 
…C_DIAGNOSTIC_IGNORED_UNUSED_PARAMETER around net-snmp headers

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/ax_c_pragmas.m4: add many C++ pragmas about CPPUNIT grief seen on …
e5c789d 
…MacOS builds [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
tests/*.cpp: wrap CPPUNIT includes with more pragmas to ignore warnin…
14c7e2b 
…gs [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: try to mark Homebrew (MacOS) include paths as "-isystem"…
2cb7e32 
… to avoid some warnings [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml, docs/config-prereqs.txt: enable cppunit with Ma…
8fc0031 
…cOS/Homebrew builds [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: for MacOS/Homebrew builds, do not distruct system includ…
99cb141 
…e dirs by default [networkupstools#2501]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: now ci_build.sh used for MacOS/Homebrew builds …
669c860 
…knows to not distruct system include dirs by default [networkupstools#2501]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: stash resulting config.nut_report_feature.log [n…
f0ac424 
…etworkupstools#2501]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
configure.ac: detect WITH_SSL variants before other libraries (notabl…
a656693 
…y net-snmp)

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
drivers/Makefile.am: undefine NETSNMP_USE_OPENSSL if building without it
ae1b66a 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
tools/nut-scanner/Makefile.am: undefine NETSNMP_USE_OPENSSL if buildi…
4211f42 
…ng without it

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: use clang (not gcc) directly, gcc now seems to …
ef8b140 
…just be an alias [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: do not set CPPFLAGS on MacOS/Homebrew builds [networkups…
0c840f5 
…tools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: try to ensure openssl@3 usability by reinstalli…
c62d11b 
…ng it in the end, and report what pkg-config knows

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
docs/config-prereqs.txt, .circleci/config.yml: we can detect HOMEBREW…
4fbf784 
…_PREFIX from the running system [networkupstools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: report what "brew" knows about openssl* package(s)
8afa21b 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: relink openssl package
0e13619 
Signed-off-by: Jim Klimov <[email protected]>
jimklimov added 11 commits July 4, 2024 01:16
@jimklimov
.circleci/config.yml: relink openssl package if needed, and fail job …
151f1b9 
…if we can not

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: clean up debugging around openssl@3 [networkups…
7d504b8 
…tools#2502]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/nut_check_libnetsnmp.m4: report myCFLAGS_SOURCE and myLIBS_SOURCE …
0ef11b1 
…from which we learned the settings

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
.circleci/config.yml: relink net-snmp from brew to be in default sear…
22fef52 
…ch paths

It seems the XCode version of the library and its headers
gets preferred, so we either find no symbols or load the
library variant built without them.

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/nut_check_libnetsnmp.m4: check for both headers we use typically, …
24ed052 
…and report the findings

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
tools/nut-scanner/nutscan-init.c: do not detect NUT_PLATFORM_APPLE_OS…
8d7fe66 
…X as WITH_MACOSX (driver)

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/ax_realpath_lib.m4: revise to better detect MacOS *.dylib files [n…
6656302 
…etworkupstools#2431]

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/nut_check_libnetsnmp.m4: revise detection of the two headers
3359fa4 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
configure.ac: refactor with PROBE_OS_GROUP/PROBE_OS_USER to try "id" …
4e33ec9 
…where "getent" is missing

Primarily this facilitates "in-place replacement" builds

Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
m4/ax_realpath_lib.m4: fall back to use "uname -m" for MacOS linker arch
a3914f0 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov
ci_build.sh: cater for netsnmp+openssl intimacy on MacOS/Homebrew
0d9ab26 
Signed-off-by: Jim Klimov <[email protected]>
@jimklimov jimklimov added CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) macOS portability We want NUT to build and run everywhere possible impacts-release-2.8.2 Issues reported against NUT release 2.8.2 (maybe vanilla or with minor packaging tweaks) labels Jul 3, 2024
@jimklimov jimklimov added this to the 2.8.3 milestone Jul 3, 2024
@jimklimov jimklimov added SNMP SSL/NSS Issues and PRs about SSL, TLS and other crypto-related matters labels Jul 3, 2024
@jimklimov jimklimov merged commit edf3c7e into networkupstools:master Jul 4, 2024
30 checks passed
This was referenced Jul 4, 2024
Merged
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) impacts-release-2.8.2 Issues reported against NUT release 2.8.2 (maybe vanilla or with minor packaging tweaks) macOS portability We want NUT to build and run everywhere possible SNMP SSL/NSS Issues and PRs about SSL, TLS and other crypto-related matters
Projects
None yet
Milestone
2.8.3
Development

Successfully merging this pull request may close these issues.
1 participant
@jimklimov