pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

0ad: Modify patch for external premake



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Dec 15 15:37:41 2021 +0100
Changeset:	79c4d817652cf024e71319f359bad03a6f69c455

Modified Files:
	0ad/distinfo
	0ad/patches/patch-build_workspaces_update-workspaces.sh

Log Message:
0ad: Modify patch for external premake

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=79c4d817652cf024e71319f359bad03a6f69c455

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 0ad/distinfo                                           |  2 +-
 .../patch-build_workspaces_update-workspaces.sh        | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diffs:
diff --git a/0ad/distinfo b/0ad/distinfo
index f6009d71d7..6df7dc8ec6 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -6,7 +6,7 @@ SHA512 (0ad-0.0.25b-alpha-unix-build.tar.xz) = e8069897b97b381099ab5ec5868d27e96
 Size (0ad-0.0.25b-alpha-unix-build.tar.xz) = 75579956 bytes
 SHA1 (patch-build_premake_extern__libs5.lua) = 4a0c97a89945d0818fcb22ab09aa329160e727e8
 SHA1 (patch-build_workspaces_clean-workspaces.sh) = fed7e867eb8e24e37860599269f9feb4d30c5a43
-SHA1 (patch-build_workspaces_update-workspaces.sh) = 3e92f823e3204451522055a5f4cd2ee1d5819b2f
+SHA1 (patch-build_workspaces_update-workspaces.sh) = 4a6ec008da64a98230173f3a242cea2503321631
 SHA1 (patch-libraries_source_fcollada_include_FCDocument_FCDocument.h) = 96aef76c02ae4a3f47fdb7c31bf7d11490ba5d09
 SHA1 (patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h) = 956ba6c19b0f3ea2a35f686bf1825efc07169b89
 SHA1 (patch-libraries_source_fcollada_include_FUtils_Platforms.h) = 32308e3fe673903b4b1a17c364840818136411b9
diff --git a/0ad/patches/patch-build_workspaces_update-workspaces.sh b/0ad/patches/patch-build_workspaces_update-workspaces.sh
index 5c0f201939..1760d28888 100644
--- a/0ad/patches/patch-build_workspaces_update-workspaces.sh
+++ b/0ad/patches/patch-build_workspaces_update-workspaces.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- build/workspaces/update-workspaces.sh.orig	2015-06-14 20:43:12.000000000 +0000
+--- build/workspaces/update-workspaces.sh.orig	2021-07-27 21:57:40.000000000 +0000
 +++ build/workspaces/update-workspaces.sh
 @@ -1,10 +1,5 @@
  #!/bin/sh
@@ -22,3 +22,19 @@ $NetBSD$
      MAKE=${MAKE:="gmake"}
      ;;
    * )
+@@ -120,11 +115,14 @@ if [ "$with_system_premake5" = "false" ]
+   ${MAKE} -C $PREMAKE_BUILD_DIR ${JOBS} || die "Premake build failed"
+ 
+   premake_command="premake5/bin/release/premake5"
++  cd ..
++else
++  cd ../premake
+ fi
++# Now in build/premake subdirectory
+ 
+ echo
+ 
+-cd ..
+ 
+ # If we're in bash then make HOSTTYPE available to Premake, for primitive arch-detection
+ export HOSTTYPE="$HOSTTYPE"


Home | Main Index | Thread Index | Old Index