Skip to content
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

Do not use libgit2 for MacOS static builds #751

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Do not use libgit2 for MacOS static builds #751

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
12 changes: 6 additions & 6 deletions .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ jobs:
- name: Build Galacticus
run: |
set -o pipefail
make -j`sysctl -n hw.activecpu` Galacticus.exe tests.hashes.cryptographic.exe 2>&1 | tee build.log
make -j`sysctl -n hw.activecpu` USEGIT2=no Galacticus.exe tests.hashes.cryptographic.exe 2>&1 | tee build.log
./scripts/build/staticRelinker.pl `grep '\-o Galacticus.exe' build.log`
./scripts/build/staticRelinker.pl `grep '\-o tests.hashes.cryptographic.exe' build.log`
dsymutil -o Galacticus.exe.dSYM Galacticus.exe
Expand Down Expand Up @@ -457,7 +457,7 @@ jobs:
- name: Build Galacticus
run: |
set -o pipefail
make -j`sysctl -n hw.activecpu` Galacticus.exe 2>&1 | tee build.log
make -j`sysctl -n hw.activecpu` USEGIT2=no Galacticus.exe 2>&1 | tee build.log
./scripts/build/staticRelinker.pl `grep '\-o Galacticus.exe' build.log`
dsymutil -o Galacticus.exe.dSYM Galacticus.exe
zip -r debugSymbolsMacOS-M1.zip Galacticus.exe.dSYM
Expand Down Expand Up @@ -486,7 +486,7 @@ jobs:
uses: ./.github/actions/buildMacOS
- name: Build Galacticus
run: |
make -j`sysctl -n hw.activecpu` GALACTICUS_BUILD_OPTION=lib libgalacticus.so
make -j`sysctl -n hw.activecpu` USEGIT2=no GALACTICUS_BUILD_OPTION=lib libgalacticus.so
- name: Package the code
run: |
cd $GALACTICUS_EXEC_PATH
Expand Down Expand Up @@ -523,7 +523,7 @@ jobs:
uses: ./.github/actions/buildMacOS
- name: Build Galacticus
run: |
make -j`sysctl -n hw.activecpu` Galacticus.exe
make -j`sysctl -n hw.activecpu` USEGIT2=no Galacticus.exe
- name: Build tools
run: |
export GALACTICUS_EXEC_PATH=`pwd`
Expand Down Expand Up @@ -599,7 +599,7 @@ jobs:
uses: ./.github/actions/buildMacOS
- name: Build Galacticus
run: |
make -j`sysctl -n hw.activecpu` Galacticus.exe 2>&1 | tee build.log
make -j`sysctl -n hw.activecpu` USEGIT2=no Galacticus.exe 2>&1 | tee build.log
./scripts/build/staticRelinker.pl `grep '\-o Galacticus.exe' build.log`
- name: Build tools
run: |
Expand Down Expand Up @@ -1380,7 +1380,7 @@ jobs:
sudo port select --set python3 python312
- name: Build Galacticus
run: |
make -j`sysctl -n hw.activecpu` GALACTICUS_BUILD_OPTION=lib libgalacticus.so
make -j`sysctl -n hw.activecpu` USEGIT2=no GALACTICUS_BUILD_OPTION=lib libgalacticus.so
mkdir galacticus
mkdir galacticus/lib
mkdir galacticus/python
Expand Down
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@ $(BUILDPATH)/Makefile_Config_MathEval: source/libmatheval_config.cpp
# line.
-include $(BUILDPATH)/Makefile_Config_Git2
ifeq '${STATIC}' '-static'
$(BUILDPATH)/Makefile_Config_Git2:
@mkdir -p $(BUILDPATH)
echo "FCFLAGS += -DGIT2UNAVAIL" > $(BUILDPATH)/Makefile_Config_Git2
echo "CFLAGS += -DGIT2UNAVAIL" > $(BUILDPATH)/Makefile_Config_Git2
echo "CPPFLAGS += -DGIT2UNAVAIL" >> $(BUILDPATH)/Makefile_Config_Git2
else ifeq '${USEGIT2}' 'no'
$(BUILDPATH)/Makefile_Config_Git2:
@mkdir -p $(BUILDPATH)
echo "FCFLAGS += -DGIT2UNAVAIL" > $(BUILDPATH)/Makefile_Config_Git2
Expand Down
Loading