Merge pull request #1575 from linuxgemini/fix-macos-build

fix macos builds by not defining _POSIX_C_SOURCE in mfd_aes_brute.c if macos
This commit is contained in:
Iceman authored and GitHub committed 2022-01-31 17:50:25 +01:00
commit 405c9d5d94
3 files changed
+28 -3

No files matched your search

+21
View File
@@ -37,6 +37,13 @@ jobs:
- name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
- name: Fix linkings for qt5 and openssl
working-directory: /usr/local/include
continue-on-error: true
run: |
ln -svf ../opt/openssl@3/include/openssl .
ln -svf ../opt/qt@5/include/qt .
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
@@ -78,6 +85,13 @@ jobs:
- name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
- name: Fix linkings for qt5 and openssl
working-directory: /usr/local/include
continue-on-error: true
run: |
ln -svf ../opt/openssl@3/include/openssl .
ln -svf ../opt/qt@5/include/qt .
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
@@ -120,6 +134,13 @@ jobs:
- name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
- name: Fix linkings for qt5 and openssl
working-directory: /usr/local/include
continue-on-error: true
run: |
ln -svf ../opt/openssl@3/include/openssl .
ln -svf ../opt/qt@5/include/qt .
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
+6 -2
View File
@@ -22,8 +22,12 @@ ifneq (,$(findstring MINGW,$(platform)))
endif
# OS X needs linking to openssl
ifeq ($(platform),Darwin)
MYLDFLAGS += -L/usr/local/opt/openssl@3/lib
ifeq ($(USE_BREW),1)
MYLDFLAGS += -L$(BREW_PREFIX)/opt/openssl@3/lib -L$(BREW_PREFIX)/opt/openssl@1.1/lib
endif
ifeq ($(USE_MACPORTS),1)
MYLDFLAGS += -L$(MACPORTS_PREFIX)/lib/openssl-3 -L$(MACPORTS_PREFIX)/lib/openssl-1.1
endif
brute_key : $(OBJDIR)/brute_key.o $(MYOBJS)
+1 -1
View File
@@ -18,7 +18,7 @@
#define __STDC_FORMAT_MACROS
#if !defined(_WIN32)
#if !defined(_WIN32) && !defined(__APPLE__)
#define _POSIX_C_SOURCE 200112L // need localtime_r()
#endif