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

Jump to bottom

golb: Update to latest commit #1301

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

golb: Update to latest commit #1301

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fee37fa
golb: Update to latest commit
TheRealKeto Nov 4, 2022
de04083
golb: Catch up with upstream
TheRealKeto Dec 22, 2022
9bb7261
golb: General Makefile cleanup, I guess...
TheRealKeto Dec 22, 2022
098378b
chore: Fix merge conflicts
TheRealKeto Jan 24, 2023
3bc36fa
Catch up with upstream
TheRealKeto Apr 25, 2023
bf68eec
golb: Goofy™ update
TheRealKeto Apr 25, 2023
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
16 changes: 5 additions & 11 deletions makefiles/golb.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ endif
ifneq (,$(findstring arm64,$(MEMO_TARGET)))

SUBPROJECTS += golb
GOLB_COMMIT := 7ffffff2f80cbee13709392367a01a37c50fc2cb
GOLB_VERSION := 1.0.1+git20210608.$(shell echo $(GOLB_COMMIT) | cut -c -7)
GOLB_COMMIT := 7ffffff03afa3bbf7bf6ce2a4bef025d572391ec
GOLB_CFLAGS := $(addprefix -framework ,IOKit CoreFoundation) -lcompression
GOLB_VERSION := 1.0.1+git20230103.$(shell echo $(GOLB_COMMIT) | cut -c -7)
DEB_GOLB_V ?= $(GOLB_VERSION)

golb-setup: setup
Expand All @@ -19,17 +20,11 @@ golb:
@echo "Using previously built golb."
else
golb: golb-setup
$(CC) $(CFLAGS) \
-framework IOKit \
-framework CoreFoundation \
-lcompression \
$(CC) $(CFLAGS) $(GOLB_CFLAGS) \
$(BUILD_WORK)/golb/golb.c \
$(BUILD_WORK)/golb/aes_ap.c \
-o $(BUILD_STAGE)/golb/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/aes_ap
$(CC) $(CFLAGS) \
-framework IOKit \
-framework CoreFoundation \
-lcompression \
$(CC) $(CFLAGS) $(GOLB_CFLAGS) \
$(BUILD_WORK)/golb/golb_ppl.c \
$(BUILD_WORK)/golb/aes_ap.c \
-o $(BUILD_STAGE)/golb/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/aes_ap_ppl
Expand All @@ -39,7 +34,6 @@ endif
golb-package: golb-stage
# golb.mk Package Structure
rm -rf $(BUILD_DIST)/golb
mkdir -p $(BUILD_DIST)/golb

# golb.mk Prep golb
cp -a $(BUILD_STAGE)/golb $(BUILD_DIST)/
Expand Down