[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/

[Conrad Kostecki]

commit:     ba6c91660bfe2b69e9dd3a8bcb3d3d4452f12a8a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan  8 15:11:46 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 22:09:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6c9166

app-emulation/plus42: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29017
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../plus42/files/plus42-1.0.4-fix-build-intel-lib.patch      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch b/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch
deleted file mode 100644
index e1e2ea89897a..000000000000
--- a/app-emulation/plus42/files/plus42-1.0.4-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh free42-nologo-2.5.3/gtk/build-intel-lib.sh
---- free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh	2019-09-01 17:44:47.000000000 +0200
-+++ free42-nologo-2.5.3/gtk/build-intel-lib.sh	2019-09-03 23:58:30.604579443 +0200
-@@ -65,7 +65,7 @@
- esac
- 
- cd LIBRARY
--$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc

[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/

[Bernard Cafarelli]

commit:     514bb15cc632a995579fe881184b00543639e745
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 11:26:04 2024 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri May  3 11:26:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514bb15c

app-emulation/plus42: properly call $AR

Closes: https://bugs.gentoo.org/931079
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
index 283c6c1435be..304f20ec83b2 100644
--- a/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
+++ b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
@@ -15,7 +15,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
  # Hack to support FreeBSD; not 100% sure what this does, but it produces a
  # library that passes all tests.
  
-@@ -64,8 +57,11 @@
+@@ -64,8 +57,10 @@
      ;;
  esac
  
@@ -23,8 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
 +
  cd LIBRARY
 -$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+echo $MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a AR_CMD="$AR rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
  mv libbid.a ../../gcc111libbid.a
  cd ../..
  ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc

[gentoo-commits] repo/gentoo:master commit in: app-emulation/plus42/files/

[Bernard Cafarelli]

commit:     db3e7e74f686f125227c6e1ad5d573c83cdaa360
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 07:55:15 2024 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat May  4 07:55:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3e7e74

app-emulation/plus42: also handle unset $AR

Closes: https://bugs.gentoo.org/931146
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
index 304f20ec83b2..c9cde2fbda2c 100644
--- a/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
+++ b/app-emulation/plus42/files/plus42-1.0.12-fix-build-intel-lib.patch
@@ -23,7 +23,7 @@ diff -Naur free42-nologo-3.0.16.orig/gtk/build-intel-lib.sh free42-nologo-3.0.16
 +
  cd LIBRARY
 -$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
-+$MK $OS_ARG A=a AR_CMD="$AR rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a AR_CMD="${AR:-ar} rv" CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
  mv libbid.a ../../gcc111libbid.a
  cd ../..
  ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc