fixup! WIP: libevent testing

.github/workflows/ci-scripts-build.yml

@@ -169,7 +169,7 @@ jobs:
         make -C documentation
     - name: otool
       if: runner.os == 'macOS'
-      run: otool -D -L bundle/usr/*/lib/*.dylib lib/*/*.dylib bin/*/pvxinfo
+      run: otool -D -L -l bundle/usr/*/lib/*.dylib lib/*/*.dylib 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

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

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

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

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

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