github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
fix macos builds by not defining _POSIX_C_SOURCE in mfd_aes_brute.c if macos
This commit is contained in:
Iceman 2022-01-31 17:50:25 +01:00 • committed by GitHub
commit 405c9d5d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/macos.yml vendored
View file

@ -37,6 +37,13 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl 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 - name: Install Python dependencies
run: | run: |
python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip
@ -78,6 +85,13 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl 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 - name: Install Python dependencies
run: | run: |
python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip
@ -120,6 +134,13 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl 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 - name: Install Python dependencies
run: | run: |
python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip

8
tools/mfd_aes_brute/Makefile
View file

@ -22,8 +22,12 @@ ifneq (,$(findstring MINGW,$(platform)))
endif endif
# OS X needs linking to openssl # OS X needs linking to openssl
ifeq ($(platform),Darwin) ifeq ($(USE_BREW),1)
MYLDFLAGS += -L/usr/local/opt/openssl@3/lib 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 endif
brute_key : $(OBJDIR)/brute_key.o $(MYOBJS) brute_key : $(OBJDIR)/brute_key.o $(MYOBJS)

2
tools/mfd_aes_brute/mfd_aes_brute.c
View file

@ -18,7 +18,7 @@
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#if !defined(_WIN32) #if !defined(_WIN32) && !defined(__APPLE__)
#define _POSIX_C_SOURCE 200112L // need localtime_r() #define _POSIX_C_SOURCE 200112L // need localtime_r()
#endif #endif