All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 1288d9e4 authored by David Johnson's avatar David Johnson

Help the perl eventsys wrappers build on modern Ubuntu.

parent 522f135c
......@@ -60,7 +60,7 @@ SWIG = swig2.0
# We should be able to use va_copy everywhere, but be conservative
SWIGCFLAGS =
ifeq ($(ARCH),amd64)
ifeq ($(ARCH),$(filter $(ARCH),amd64 x86_64))
SWIGCFLAGS += -DHAVE_VA_COPY
endif
......@@ -88,8 +88,11 @@ TCFLAGS = $(CFLAGS) $(PUBSUBMTFLAGS)
# Special CFLAGS w/o warnings, for SWIG-generated code
CFLAGS_NOWARN += -O2 -g -I. $(PUBSUBFLAGS)
ifeq ($(SYSTEM),Linux)
PCORE = -I$(shell find /usr/lib/perl5/$(PERLVERS) | grep CORE\$$$") \
`perl -e 'use Config; print $$Config{ccflags};'`
PCORELIB = -I$(shell find /usr/lib/perl5/$(PERLVERS) | grep CORE\$$$")
ifeq ($(PCORE),)
PCORELIB = -I$(shell find /usr/lib/*/perl/$(PERLVERS) | grep CORE\$$$")
endif
PCORE = $(PCORELIB) `perl -e 'use Config; print $$Config{ccflags};'`
PYCORE = -I@PYTHON_INCLUDE@
else
......
#!/usr/bin/perl -w
#
# Copyright (c) 2006, 2013 University of Utah and the Flux Group.
# Copyright (c) 2006, 2013, 2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -43,4 +43,15 @@ foreach my $p (@INC) {
exit(0);
}
}
#
# Some Linuxes just don't have a perl5/<major>.<minor>.<patch>; they only
# have perl/<major>.<minor>.<patch>; so accept that if all else fails.
#
foreach my $p (@INC) {
if ($p =~ /perl\/(\d+\.\d+\.\d+)$/) {
print "$1";
exit(0);
}
}
exit(1);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment