From fee37fa0df50c57a973ff9c094332c86cd9ff89a Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Thu, 3 Nov 2022 23:09:00 -0400 Subject: [PATCH 1/3] golb: Update to latest commit Signed-off-by: TheRealKeto --- makefiles/golb.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makefiles/golb.mk b/makefiles/golb.mk index 692e479b52..68b572233d 100644 --- a/makefiles/golb.mk +++ b/makefiles/golb.mk @@ -5,8 +5,8 @@ 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 := 7ffffff4fc123bfbf4aaa97ee26b81e3877f76cc +GOLB_VERSION := 1.0.1+git20220919.$(shell echo $(GOLB_COMMIT) | cut -c -7) DEB_GOLB_V ?= $(GOLB_VERSION) golb-setup: setup @@ -39,10 +39,9 @@ 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/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/golb + cp -a $(BUILD_STAGE)/golb $(BUILD_DIST)/golb # golb.mk Sign $(call SIGN,golb,tfp0.xml) @@ -55,4 +54,4 @@ golb-package: golb-stage .PHONY: golb golb-package -endif \ No newline at end of file +endif From 9bb7261b4045fe435d6ed61211a10ade8bc9b67d Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Wed, 21 Dec 2022 23:01:00 -0500 Subject: [PATCH 2/3] golb: General Makefile cleanup, I guess... Signed-off-by: TheRealKeto --- makefiles/golb.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/makefiles/golb.mk b/makefiles/golb.mk index 68b572233d..8518239078 100644 --- a/makefiles/golb.mk +++ b/makefiles/golb.mk @@ -6,6 +6,7 @@ ifneq (,$(findstring arm64,$(MEMO_TARGET))) SUBPROJECTS += golb GOLB_COMMIT := 7ffffff4fc123bfbf4aaa97ee26b81e3877f76cc +GOLB_CFLAGS := $(addprefix -framework ,IOKit CoreFoundation) -lcompression GOLB_VERSION := 1.0.1+git20220919.$(shell echo $(GOLB_COMMIT) | cut -c -7) DEB_GOLB_V ?= $(GOLB_VERSION) @@ -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 From bf68eec495fe2d6895b40f588dd89f9e5b223dd0 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Mon, 24 Apr 2023 21:25:00 -0400 Subject: [PATCH 3/3] =?UTF-8?q?golb:=20Goofy=E2=84=A2=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: TheRealKeto --- makefiles/golb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/golb.mk b/makefiles/golb.mk index 1b6bb3b646..5d0dd809b8 100644 --- a/makefiles/golb.mk +++ b/makefiles/golb.mk @@ -5,9 +5,9 @@ endif ifneq (,$(findstring arm64,$(MEMO_TARGET))) SUBPROJECTS += golb -GOLB_COMMIT := 7ffffff4fc123bfbf4aaa97ee26b81e3877f76cc +GOLB_COMMIT := 7ffffff03afa3bbf7bf6ce2a4bef025d572391ec GOLB_CFLAGS := $(addprefix -framework ,IOKit CoreFoundation) -lcompression -GOLB_VERSION := 1.0.1+git20220919.$(shell echo $(GOLB_COMMIT) | cut -c -7) +GOLB_VERSION := 1.0.1+git20230103.$(shell echo $(GOLB_COMMIT) | cut -c -7) DEB_GOLB_V ?= $(GOLB_VERSION) golb-setup: setup