From 3be00994a90f2002c9788556cfde51d0619804ef Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sun, 30 Jul 2023 07:52:23 -0700
Subject: [PATCH] fixup! WIP: libevent testing

---
 .github/workflows/ci-scripts-build.yml | 8 ++++++--
 bundle/libevent                        | 2 +-
 configure/CONFIG_SITE                  | 4 ++++
 configure/Makefile                     | 3 +++
 setup/CONFIG_PVXS_MODULE               | 4 +++-
 setup/Makefile                         | 3 +++
 setup/RULES_PVXS_MODULE                | 2 ++
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index 98c97a3f..1435c07c 100644
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -168,8 +168,11 @@ jobs:
         pip install breathe Sphinx
         make -C documentation
     - name: otool
-      if: runner.os == 'macOS'
-      run: otool -D -L bundle/usr/*/lib/*.dylib lib/*/*.dylib bin/*/pvxinfo
+      if: ${{ always() && runner.os == 'macOS' }}
+      run: otool -D -L -l bundle/usr/*/lib/*.dylib lib/*/*.dylib bin/*/pvxinfo
+    - name: readelf
+      if: ${{ always() && runner.os == 'Linux' }}
+      run: readelf -d bundle/usr/*/lib/*.so lib/*/*.so bin/*/pvxinfo
     - name: Host info
       run: python .ci/cue.py --add-path "{TOP}/bin/{EPICS_HOST_ARCH}" --add-path "{TOP}/bundle/usr/{EPICS_HOST_ARCH}/lib" exec pvxinfo -D
     - name: Run main module tests
@@ -178,6 +181,7 @@ jobs:
       run: python .ci/cue.py test-results
     - name: CDT Check
       run: ./.ci-local/cdt-check.sh
+      if: ${{ always() }}
       if: runner.os == 'Linux'
     - name: Troubleshoot
       if: ${{ always() }}
diff --git a/bundle/libevent b/bundle/libevent
index d1b3e8df..0ef0e4d3 160000
--- a/bundle/libevent
+++ b/bundle/libevent
@@ -1 +1 @@
-Subproject commit d1b3e8df904ebc884091de9a034197e5f070ce6c
+Subproject commit 0ef0e4d3dfcf4ffafc885a1c6f228b4af16af87f
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 9bdb4af6..1bf462be 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -45,3 +45,7 @@ CHECK_RELEASE = YES
 USR_CPPFLAGS_WIN32 += -DNOMINMAX -D_WIN32_WINNT=_WIN32_WINNT_VISTA
 
 USR_CPPFLAGS += -DUSE_TYPED_RSET
+
+ifndef BASE_3_15
+CAT ?= $(PERL) -MExtUtils::Command -e cat
+endif
diff --git a/configure/Makefile b/configure/Makefile
index d3fce6f4..93792fbf 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -31,5 +31,8 @@ TOOLCHAIN: toolchain.c
 	$(CPP) $(CPPFLAGS) $(INCLUDES) ../toolchain.c > $@.tmp
 	$(CPP) $(CPPFLAGS) $(INCLUDES) ../probe-openssl.c > probe-openssl.out && echo "EVENT2_HAS_OPENSSL = YES" >> $@.tmp || echo "No OpenSSL"
 	$(MV) $@.tmp $@
+	$(ECHO) ">>> $@"
+	$(CAT) $@
+	$(ECHO) "<<< $@"
 
 endif
diff --git a/setup/CONFIG_PVXS_MODULE b/setup/CONFIG_PVXS_MODULE
index 02ecf612..5217c62b 100644
--- a/setup/CONFIG_PVXS_MODULE
+++ b/setup/CONFIG_PVXS_MODULE
@@ -20,8 +20,10 @@ LIBEVENT_SYS_LIBS = $(LIBEVENT_SYS_LIBS_$(T_A))
 # apply to include search paths
 INCLUDES += $(if $(LIBEVENT_PREFIX),-I$(LIBEVENT_PREFIX)/include)
 
-LIBEVENT_BUNDLE_LDFLAGS_Darwin_NO = $(if $(LIBEVENT_PREFIX),-Wl,-rpath,$(LIBEVENT_PREFIX)/lib)
+LIBEVENT_BUNDLE_LDFLAGS__RPATH=-Wl,-rpath,$(LIBEVENT_PREFIX)/lib
+LIBEVENT_BUNDLE_LDFLAGS_Darwin_NO = $(if $(LIBEVENT_PREFIX),$(LIBEVENT_BUNDLE_LDFLAGS__RPATH))
 LIBEVENT_BUNDLE_LDFLAGS += $(LIBEVENT_BUNDLE_LDFLAGS_$(OS_CLASS)_$(STATIC_BUILD))
+$(info XXX LIBEVENT_PREFIX=$(LIBEVENT_PREFIX) LIBEVENT_BUNDLE_LDFLAGS=$(LIBEVENT_BUNDLE_LDFLAGS))
 
 event_core_DIR = $(LIBEVENT_PREFIX)/lib
 event_openssl_DIR = $(LIBEVENT_PREFIX)/lib
diff --git a/setup/Makefile b/setup/Makefile
index b8abdf94..8cae1153 100644
--- a/setup/Makefile
+++ b/setup/Makefile
@@ -46,5 +46,8 @@ EXPAND_ARGS += "-DLIBEVENT_SYS_LIBS=$(_LIBEVENT_SYS_LIBS)"
 
 TOOLCHAIN_PVXS.$(T_A): ../TOOLCHAIN_PVXS.target@
 	$(EXPAND_TOOL) $(EXPAND_ARGS) $< $@
+	$(ECHO) ">>> $@"
+	$(CAT) $@
+	$(ECHO) "<<< $@"
 
 endif
diff --git a/setup/RULES_PVXS_MODULE b/setup/RULES_PVXS_MODULE
index 0348f5c6..de0f25f6 100644
--- a/setup/RULES_PVXS_MODULE
+++ b/setup/RULES_PVXS_MODULE
@@ -18,6 +18,7 @@ ifeq (,$(LIBEVENT_PREFIX))
 define _PVXS_ADD_LIBEVENT
 $(1)_SYS_LIBS := $$($(1)_SYS_LIBS) $$(if $$(filter pvxs,$$($(1)_LIBS)),$$(LIBEVENT_BUNDLE_LIBS))
 $(1)_SYS_LIBS := $$($(1)_SYS_LIBS) $$(if $$(filter pvxs,$$($(1)_LIBS)),$$(LIBEVENT_SYS_LIBS))
+$(info AAA $(1) $$(filter pvxs,$$($(1)_LIBS)))
 endef
 
 else
@@ -28,6 +29,7 @@ define _PVXS_ADD_LIBEVENT
 $(1)_LIBS     := $$($(1)_LIBS)     $$(if $$(filter pvxs,$$($(1)_LIBS)),$$(LIBEVENT_BUNDLE_LIBS))
 $(1)_SYS_LIBS := $$($(1)_SYS_LIBS) $$(if $$(filter pvxs,$$($(1)_LIBS)),$$(LIBEVENT_SYS_LIBS))
 $(1)_LDFLAGS  := $$($(1)_LDFLAGS)  $$(if $$(filter pvxs,$$($(1)_LIBS)),$$(LIBEVENT_BUNDLE_LDFLAGS))
+$(info BBB $(1) $$(filter pvxs,$$($(1)_LIBS)))
 endef
 
 endif