Skip to content

Improve make 3.81 support #1150

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

Merged
LourensVeen merged 1 commit into from
Jun 3, 2025
Merged

Improve make 3.81 support #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/sapporo_light/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ $(DYNAMIC_LIB): $(OBJS) $(CUOBJS)
$(NVCC) $(NVCCFLAGS) -c $< -o $@

$(PKG_CONFIG_FILE):
$(file >$@,$(PKG_CONFIG_CONTENTS))
# the file function is not available on old macOS make, so we make do with this
printf '' >$@
$(foreach line,$(PKG_CONFIG_CONTENTS),printf '%s\n' '$(line)' >>$@;)


.PHONY: clean
Expand Down
3 changes: 1 addition & 2 deletions src/amuse/rfi/tools/dir_templates/Makefile_cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ VERSION = VERSION
##### Modify URL as needed #####
$(DOWNLOAD) https://github.com/{code}/{code}/archive/$(VERSION).tar.gz >$@

PATCHES := $(file < patches/series)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces
PATCHES := $(shell cat patches/series)

src/{code}-$(VERSION): {code}.tar.gz
##### Modify as needed #####
Expand Down
3 changes: 1 addition & 2 deletions src/amuse/rfi/tools/dir_templates/Makefile_fortran
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ VERSION = VERSION
##### Modify URL as needed #####
$(DOWNLOAD) https://github.com/{code}/{code}/archive/$(VERSION).tar.gz >$@

PATCHES := $(file < patches/series)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces
PATCHES := $(shell cat patches/series)

src/{code}-$(VERSION): {code}.tar.gz
##### Modify as needed #####
Expand Down
4 changes: 1 addition & 3 deletions src/amuse_mesa_r15140/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ src/mesa-$(MESA_VERSION).zip:

MESA_DIR := src/mesa-$(MESA_VERSION)

PATCHES := $(file < patches/series_mesa)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces

PATCHES := $(shell cat patches/series)

$(MESA_DIR): src/mesa-$(MESA_VERSION).zip
cd src && unzip -q ../$<
Expand Down
3 changes: 1 addition & 2 deletions src/amuse_mesa_r2208/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ support/config.mk:
mesa_r2208.zip:
$(DOWNLOAD) https://zenodo.org/record/2603017/files/mesa-r2208.zip >$@

PATCHES := $(file < patches/series)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces
PATCHES := $(shell cat patches/series)

src/mesa: mesa_r2208.zip
mkdir -p src
Expand Down
3 changes: 1 addition & 2 deletions src/amuse_mocassin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ VERSION = 2.02.70
mocassin.$(VERSION).tar.gz:
$(DOWNLOAD) https://amuse.strw.leidenuniv.nl/codes/mocassin.$(VERSION).tar.gz >$@

PATCHES := $(file < patches/series)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces
PATCHES := $(shell cat patches/series)

src:
mkdir -p src
Expand Down
3 changes: 1 addition & 2 deletions src/amuse_mpiamrvac/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ VERSION = r187
mpiamrvac.tar.gz:
$(DOWNLOAD) http://amuse.strw.leidenuniv.nl/codes/mpiamrvac-$(VERSION).tgz >$@

PATCHES := $(file < patches/series)
PATCHES := $(patsubst %,%,$(PATCHES)) # replace newlines with spaces
PATCHES := $(shell cat patches/series)

src/mpiamrvac: | mpiamrvac.tar.gz
tar xf $|
Expand Down
8 changes: 6 additions & 2 deletions support/shared/lib-targets.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ $(DYNAMIC_LIB): $(OBJS)
$(FC) $(FCFLAGS) -c -o $*.o $<

$(PKG_CONFIG_FILE):
$(file >$@,$(PKG_CONFIG_CONTENTS))
# the file function is not available on old macOS make, so we make do with this
printf '' >$@
$(foreach line,$(PKG_CONFIG_CONTENTS),printf '%s\n' '$(line)' >>$@;)


ifdef DYNAMIC_LIB_MPI
Expand All @@ -106,7 +108,9 @@ endif
$(MPIFC) $(FCFLAGS) $(CFLAGS_MPI) -c -o $*.mo $<

$(PKG_CONFIG_FILE_MPI):
$(file >$@,$(PKG_CONFIG_CONTENTS_MPI))
# the file function is not available on old macOS make, so we make do with this
printf '' >$@
$(foreach line,$(PKG_CONFIG_CONTENTS_MPI),printf '%s\n' '$(line)' >>$@;)


# Clean up
Expand Down
Loading