Skip to content

Commit

Permalink
minor build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
whrvt committed Sep 15, 2024
1 parent a0e8cb9 commit 400aec7
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
21 changes: 21 additions & 0 deletions patches/proton/0008-Makefile.in-redist-dir-to-build-name.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/Makefile.in b/Makefile.in
index fe870e2..c001a16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ DST_LIBDIR64 := $(DST_DIR)/lib64
DIST_PREFIX := $(DST_DIR)/share/default_pfx/
DIST_VERSION := $(DST_BASE)/version
DEPLOY_DIR := ./deploy
-REDIST_DIR := ./redist
+REDIST_DIR := ./$(BUILD_NAME)

ifneq ($(UNSTRIPPED_BUILD),)
STRIP :=
@@ -1344,7 +1344,6 @@ redist: all
cp -a $(PROTONFIXES_TARGET)/libmspack.so $(REDIST_DIR)/files/lib64/
cp -a $(PROTONFIXES_TARGET)/libmspack.so.0 $(REDIST_DIR)/files/lib64/
cp $(PROTONFIXES_TARGET)/libmspack.so.0.1.0 $(REDIST_DIR)/files/lib64/
- mv $(REDIST_DIR) $(BUILD_NAME)
XZ_OPT="-9 -T0" tar -Jcf $(BUILD_NAME).tar.xz --numeric-owner --owner=0 --group=0 --null $(BUILD_NAME)
sha512sum $(BUILD_NAME).tar.xz > $(BUILD_NAME).sha512sum
@echo "Proton build available at $(BUILD_NAME).tar.xz"
16 changes: 9 additions & 7 deletions setup.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash
pkgrel=9-3
pkgname="proton-osu-${pkgrel}"
pkgver=9-3
buildname="proton-osu"
pkgname="${buildname}-${pkgver}"

protonurl=https://github.com/CachyOS/proton-cachyos.git
protontag=cachyos-9.0-20240905
umu_protonfixesurl=https://github.com/Open-Wine-Components/umu-protonfixes.git
gittag=cachyos-9.0-20240905

##############################################
# Do everything
Expand Down Expand Up @@ -36,7 +37,7 @@ _run_all() {
exit 0
}
##############################################
# Help message
# Prepare for a full build
##############################################
_prepare() {
{ _dirsetup &&
Expand All @@ -50,7 +51,7 @@ _prepare() {
##############################################
_sources() {
if ! { [ -d "${srcdir}" ] && [ -f "${srcdir}"/Makefile ] ; }; then
git clone --depth 1 --recurse-submodules --shallow-submodules "${protonurl}" "${srcdir}" -b "${gittag}" || _failure "Couldn't clone your chosen repo at the tag."
git clone --depth 1 --recurse-submodules --shallow-submodules "${protonurl}" "${srcdir}" -b "${protontag}" || _failure "Couldn't clone your chosen repo at the tag."
fi

rm -rf "${srcdir}"/protonfixes
Expand Down Expand Up @@ -201,9 +202,10 @@ _failure() {
exit 1
}
_help() {
_message "./setup.sh [help] [build] [install]"
_message "./setup.sh [help] [build] (cleanbuild) [install]"
_message "No arguments grabs sources, patches, builds, and installs"
_exit 0
_message "Adding cleanbuild just runs \"make clean\" in the build directory before \"make\""
exit 0
}
##############################################
# Main
Expand Down

0 comments on commit 400aec7

Please sign in to comment.