Skip to content

generate libtool which groks llvm openmp on macOS, detect it #49

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

Open
dimpase wants to merge 4 commits into
base: master
Choose a base branch
from
Open

generate libtool which groks llvm openmp on macOS, detect it #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e242f0f
generate libtool which groks llvm openmp on macOS, detect it
dimpase May 21, 2026
916ecbf
put openmp flags into m4ri.pc
dimpase May 21, 2026
552ac5d
test with OpenMP on macOS
dimpase May 21, 2026
d7bae5f
try to please CI on macOS and Linux
dimpase May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/distcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ jobs:
- name: Install prerequisites
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install autoconf automake libtool
sudo DEBIAN_FRONTEND=noninteractive apt-get install autoconf automake
cd /tmp
wget https://ftpmirror.gnu.org/libtool/libtool-2.5.4.tar.gz

@malb malb May 21, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like this at all, this is asking for trouble. We shouldn't force a new libtool on Linux testing for OSX.

@dimpase dimpase May 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should not be held hostage by GitHub not updating their runners :-)

tar xf libtool-2.5.4.tar.gz
cd libtool-2.5.4
./configure
make -j $JOBS
sudo make install
- name: Configure
run: |
autoreconf -i
autoreconf -ivf
ASAN_OPTIONS=detect_leaks=0 CFLAGS="-fsanitize=address" ./configure --enable-debug

- name: Check
run: ASAN_OPTIONS=detect_leaks=0 make -j $JOBS check
- name: Distcheck
Expand All @@ -32,16 +38,24 @@ jobs:
- name: Check out
uses: actions/checkout@v4
- name: Install prerequisites
run: brew install autoconf automake libtool
run: brew install autoconf automake libomp libtool
- name: Configure
run: |
autoreconf -i
./configure --enable-debug
export CPATH=$(brew --prefix)/opt/libomp/include
export LIBRARY_PATH=$(brew --prefix)/opt/libomp/lib
./configure --enable-openmp --enable-debug

- name: Check
run: make -j $JOBS check
run: |
export CPATH=$(brew --prefix)/opt/libomp/include
export LIBRARY_PATH=$(brew --prefix)/opt/libomp/lib
make -j $JOBS check
- name: Distcheck
run: make -j $JOBS distcheck
run: |
export CPATH=$(brew --prefix)/opt/libomp/include
export LIBRARY_PATH=$(brew --prefix)/opt/libomp/lib
make -j $JOBS distcheck
windows:
runs-on: windows-latest
defaults:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
*.trs
*.lo
*.o
*~
*.swp
build-aux/
!build-aux/ltmain.sh.in
m4/lt*.m4
Makefile
Makefile.in
Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4

AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -iquote$(top_builddir)/m4ri
AM_CFLAGS=${SIMD_FLAGS} ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${LIBPNG_CFLAGS}
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -iquote$(top_builddir)/m4ri @OPENMP_CFLAGS@
AM_CFLAGS=${SIMD_FLAGS} ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${LIBPNG_CFLAGS} @OPENMP_CFLAGS@

lib_LTLIBRARIES = libm4ri.la

Expand Down Expand Up @@ -59,7 +59,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = m4ri.pc

libm4ri_la_LDFLAGS = -version-info @LT_VERSION@ -no-undefined @M4RI_EXPORT_ALL_SYMBOLS_LDFLAGS@
libm4ri_la_LIBADD = $(LIBPNG_LIBADD) $(LIBM)
libm4ri_la_LIBADD = $(LIBPNG_LIBADD) $(LIBM) @OPENMP_CLIB@

SUBDIRS = . tests
DIST_SUBDIRS = $(SUBDIRS) bench
Expand Down
Loading
Loading