(cross/retro68) more patches, looking for PEFBinaryFormat.h

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (cross/retro68) more patches, looking for PEFBinaryFormat.h
From: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Date: Tue, 30 Jan 2024 14:09:29 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Tue Jan 30 23:09:29 2024 +0900
Changeset:	18221fa89952be512de80955840160e393bafce5

Modified Files:
	Retro68/TODO
	Retro68/distinfo
Added Files:
	Retro68/patches/patch-LaunchAPPL_Client_MiniVMac.cc
	Retro68/patches/patch-PEFTools_MakePEF.cc
	Retro68/patches/patch-ResourceFiles_ResourceFile.cc
	Retro68/patches/patch-gcc_newlib_libc_include___ansi.h
	Retro68/patches/patch-gcc_newlib_libc_include_sys_config.h

Log Message:
(cross/retro68) more patches, looking for PEFBinaryFormat.h

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

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

diffstat:
 Retro68/TODO                                       | 65 ++++++++++++++++++----
 Retro68/distinfo                                   |  5 ++
 .../patches/patch-LaunchAPPL_Client_MiniVMac.cc    | 20 +++++++
 Retro68/patches/patch-PEFTools_MakePEF.cc          | 20 +++++++
 .../patches/patch-ResourceFiles_ResourceFile.cc    | 18 ++++++
 .../patches/patch-gcc_newlib_libc_include___ansi.h | 22 ++++++++
 .../patch-gcc_newlib_libc_include_sys_config.h     | 22 ++++++++
 7 files changed, 161 insertions(+), 11 deletions(-)

diffs:
diff --git a/Retro68/TODO b/Retro68/TODO
index aacae1a649..76a00e6a16 100644
--- a/Retro68/TODO
+++ b/Retro68/TODO
@@ -1,12 +1,55 @@
-In file included from /usr/include/amd64/endian.h:3,
-                 from /usr/include/sys/types.h:98,
-                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/libelf/include/libelf.h:33,
-                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/libelf/src/elf32_getchdr.c:33:
-/usr/include/sys/endian.h:179: note: this is the location of the previous definition
-  179 | #define le64toh(x) htole64(x)
-      | 
-/tmp/wip/Retro68/work/Retro68-2019.8.2/ResourceFiles/ResourceFile.cc:13:10: fatal error: hfs.h: No such file or directory
-   13 | #include "hfs.h"
-      |          ^~~~~~~
+SX2@makoto 23:06:42/240130(..wip/Retro68)%  make |& tee /tmp/log                                                               
+=> Bootstrap dependency digest>=20211023: found digest-20220214
+===> Skipping vulnerability checks.
+WARNING: No /usr/pkg/pkgdb/pkg-vulnerabilities file found.
+WARNING: To fix run: `/usr/pkg/sbin/pkg_admin -K /usr/pkg/pkgdb fetch-pkg-vulnerabilities'.
+===> Building for Retro68-2019.8.2
+[  2%] Built target LaunchAPPLCommon
+[  3%] Building CXX object PEFTools/CMakeFiles/MakePEF.dir/MakePEF.cc.o
+[  6%] Built target ResourceFiles
+[  7%] Building CXX object LaunchAPPL/Common/CMakeFiles/TestLaunchAPPLCommon.dir/Test.cc.o
+[  8%] Building CXX object PEFTools/CMakeFiles/MakeImport.dir/MakeImport.cc.o
+[  8%] Building CXX object ConvertObj/CMakeFiles/ConvertObj.dir/ConvertObj.cc.o
+[  8%] Building CXX object ResourceFiles/CMakeFiles/ResInfo.dir/ResInfo.cc.o
+[  9%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/LaunchAPPL.cc.o
+[ 83%] Built target ELF
+[ 83%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/MakeExecutable.cc.o
+[ 84%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/LaunchMethod.cc.o
+In file included from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/sys/config.h:5,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/_ansi.h:11,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/alloca.h:10,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/MakePEF.cc:9:
+/tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/sys/features.h:28:10: fatal error: _newlib_version.h: No such file or directory
+   28 | #include <_newlib_version.h>
+      |          ^~~~~~~~~~~~~~~~~~~
 compilation terminated.
-
+gmake[2]: *** [PEFTools/CMakeFiles/MakePEF.dir/build.make:76: PEFTools/CMakeFiles/MakePEF.dir/MakePEF.cc.o] Error 1
+gmake[1]: *** [CMakeFiles/Makefile2:349: PEFTools/CMakeFiles/MakePEF.dir/all] Error 2
+gmake[1]: *** Waiting for unfinished jobs....
+[ 85%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/Launcher.cc.o
+In file included from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/MakeImport.cc:19:
+/tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/PEF.h:44:10: fatal error: PEFBinaryFormat.h: No such file or directory
+   44 | #include "PEFBinaryFormat.h"
+      |          ^~~~~~~~~~~~~~~~~~~
+compilation terminated.
+gmake[2]: *** [PEFTools/CMakeFiles/MakeImport.dir/build.make:76: PEFTools/CMakeFiles/MakeImport.dir/MakeImport.cc.o] Error 1
+gmake[1]: *** [CMakeFiles/Makefile2:375: PEFTools/CMakeFiles/MakeImport.dir/all] Error 2
+[ 85%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/Utilities.cc.o
+[ 86%] Linking CXX executable TestLaunchAPPLCommon
+[ 86%] Built target TestLaunchAPPLCommon
+[ 87%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/Executor.cc.o
+[ 87%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/MiniVMac.cc.o
+[ 88%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/SSH.cc.o
+[ 89%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/StreamBasedLauncher.cc.o
+[ 90%] Linking CXX executable ConvertObj
+[ 90%] Built target ConvertObj
+[ 90%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/Serial.cc.o
+[ 91%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/TCP.cc.o
+[ 92%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/SharedFile.cc.o
+[ 93%] Linking CXX executable ResInfo
+[ 93%] Built target ResInfo
+/tmp/wip/Retro68/work/Retro68-2019.8.2/LaunchAPPL/Client/SharedFile.cc: In member function 'virtual void SharedFileStream::write(const void*, size_t)':
+/tmp/wip/Retro68/work/Retro68-2019.8.2/LaunchAPPL/Client/SharedFile.cc:51:13: error: 'ofstream' is not a member of 'fs'; did you mean 'std::ofstream'?
+   51 |         fs::ofstream out(shared_directory / "in_channel_1", std::ios::binary);
+      |             ^~~~~~~~
+.... more lines
diff --git a/Retro68/distinfo b/Retro68/distinfo
index 2ad9f76ca6..82959f5026 100644
--- a/Retro68/distinfo
+++ b/Retro68/distinfo
@@ -3,4 +3,9 @@ $NetBSD$
 BLAKE2s (Retro68-2019.8.2.tar.gz) = 1d81caea9babe5882b9bf1549cc84c0c9ada3b2bccf2b47a218df22b23397da8
 SHA512 (Retro68-2019.8.2.tar.gz) = 1d70e6248f915d6947ea95ea7f47d903b94115f582612ecfe4392692f26c855c77b0980088388f4ea2d3d2f11e943b4a568037611aa489b9556ae04751e71ccf
 Size (Retro68-2019.8.2.tar.gz) = 175241148 bytes
+SHA1 (patch-LaunchAPPL_Client_MiniVMac.cc) = 47d8b9dc6706069d5581143ba878814c1462d61d
+SHA1 (patch-PEFTools_MakePEF.cc) = f3f4e71db8d73f98c5e32e6ed1abd09b9535b56f
+SHA1 (patch-ResourceFiles_ResourceFile.cc) = ea73eedfddb408169eb82beef7af132ee99096ef
+SHA1 (patch-gcc_newlib_libc_include___ansi.h) = 8943735eb0a8a9f5143c29b58b45d4bf4a523b21
+SHA1 (patch-gcc_newlib_libc_include_sys_config.h) = b3cee661db099935895c97768477d17d1ca4fdce
 SHA1 (patch-libelf_src_config.h) = 1a5d86716b8aaf16daaa1e17612b691c0afa32cb
diff --git a/Retro68/patches/patch-LaunchAPPL_Client_MiniVMac.cc b/Retro68/patches/patch-LaunchAPPL_Client_MiniVMac.cc
new file mode 100644
index 0000000000..0b8c26c285
--- /dev/null
+++ b/Retro68/patches/patch-LaunchAPPL_Client_MiniVMac.cc
@@ -0,0 +1,20 @@
+$NetBSD$
+:
+[ 89%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/SSH.cc.o
+/tmp/wip/Retro68/work/Retro68-2019.8.2/LaunchAPPL/Client/MiniVMac.cc:8:10: fatal error: hfs.h: No such file or directory
+    8 | #include "hfs.h"
+      |          ^~~~~~~
+compilation terminated.
+
+--- LaunchAPPL/Client/MiniVMac.cc.orig	2019-08-24 19:56:10.000000000 +0900
++++ LaunchAPPL/Client/MiniVMac.cc	2024-01-30 22:46:31.665649819 +0900
+@@ -5,7 +5,8 @@
+ #include "ResourceFile.h"
+ 
+ extern "C" {
+-#include "hfs.h"
++/* #include "hfs.h" */
++#include "../../hfsutils/libhfs/hfs.h"
+ }
+ 
+ #include <iostream>
diff --git a/Retro68/patches/patch-PEFTools_MakePEF.cc b/Retro68/patches/patch-PEFTools_MakePEF.cc
new file mode 100644
index 0000000000..918d65d270
--- /dev/null
+++ b/Retro68/patches/patch-PEFTools_MakePEF.cc
@@ -0,0 +1,20 @@
+$NetBSD$
+
+[ 83%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/LaunchMethod.cc.o
+/tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/MakePEF.cc:8:10: fatal error: alloca.h: No such file or directory
+    8 | #include <alloca.h>
+      |          ^~~~~~~~~~
+compilation terminated.
+
+--- PEFTools/MakePEF.cc.orig	2019-08-24 19:56:10.000000000 +0900
++++ PEFTools/MakePEF.cc	2024-01-30 22:19:27.932859420 +0900
+@@ -5,7 +5,8 @@
+ #include <fstream>
+ #include <set>
+ #include <string.h>
+-#include <alloca.h>
++/* #include <alloca.h> */
++#include "../gcc/newlib/libc/include/alloca.h"
+ 
+ #include <assert.h>
+ #include <stdint.h>
diff --git a/Retro68/patches/patch-ResourceFiles_ResourceFile.cc b/Retro68/patches/patch-ResourceFiles_ResourceFile.cc
new file mode 100644
index 0000000000..c1eb3097b7
--- /dev/null
+++ b/Retro68/patches/patch-ResourceFiles_ResourceFile.cc
@@ -0,0 +1,18 @@
+$NetBSD$
+
+/tmp/wip/Retro68/work/Retro68-2019.8.2/ResourceFiles/ResourceFile.cc:13:10: fatal error: hfs.h: No such file or directory
+   13 | #include "hfs.h"
+      |          ^~~~~~~
+compilation terminated.
+
+--- ResourceFiles/ResourceFile.cc.orig	2019-08-24 19:56:10.000000000 +0900
++++ ResourceFiles/ResourceFile.cc	2024-01-30 22:13:51.335496105 +0900
+@@ -10,7 +10,7 @@
+ #include <sys/xattr.h>
+ #endif
+ extern "C" {
+-#include "hfs.h"
++#include "libhfs/hfs.h"
+ }
+ 
+ namespace fs = boost::filesystem;
diff --git a/Retro68/patches/patch-gcc_newlib_libc_include___ansi.h b/Retro68/patches/patch-gcc_newlib_libc_include___ansi.h
new file mode 100644
index 0000000000..1134bcc7fc
--- /dev/null
+++ b/Retro68/patches/patch-gcc_newlib_libc_include___ansi.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+[ 84%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/LaunchMethod.cc.o
+In file included from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/alloca.h:10,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/MakePEF.cc:9:
+/tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/_ansi.h:10:10: fatal error: newlib.h: No such file or directory
+   10 | #include <newlib.h>
+      |          ^~~~~~~~~~
+
+--- PEFTools/../gcc/newlib/libc/include/_ansi.h.orig	2019-08-24 19:56:10.000000000 +0900
++++ PEFTools/../gcc/newlib/libc/include/_ansi.h	2024-01-30 22:41:53.763229405 +0900
+@@ -7,8 +7,8 @@
+ #ifndef	_ANSIDECL_H_
+ #define	_ANSIDECL_H_
+ 
+-#include <newlib.h>
+-#include <sys/config.h>
++#include "newlib.h"
++#include "sys/config.h"
+ 
+ /*  ISO C++.  */
+ 
diff --git a/Retro68/patches/patch-gcc_newlib_libc_include_sys_config.h b/Retro68/patches/patch-gcc_newlib_libc_include_sys_config.h
new file mode 100644
index 0000000000..bd21d3d90a
--- /dev/null
+++ b/Retro68/patches/patch-gcc_newlib_libc_include_sys_config.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+[ 83%] Building CXX object LaunchAPPL/Client/CMakeFiles/LaunchAPPL.dir/LaunchMethod.cc.o
+In file included from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/_ansi.h:11,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/alloca.h:10,
+                 from /tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/MakePEF.cc:9:
+/tmp/wip/Retro68/work/Retro68-2019.8.2/PEFTools/../gcc/newlib/libc/include/sys/config.h:5:10: fatal error: sys/features.h: No such file or directory
+    5 | #include <sys/features.h> /* POSIX defs */
+      |          ^~~~~~~~~~~~~~~~
+compilation terminated.
+
+--- PEFTools/../gcc/newlib/libc/include/sys/config.h.orig	2024-01-30 22:57:05.167249422 +0900
++++ PEFTools/../gcc/newlib/libc/include/sys/config.h	2024-01-30 22:58:26.400601194 +0900
+@@ -2,7 +2,7 @@
+ #define __SYS_CONFIG_H__
+ 
+ #include <machine/ieeefp.h>  /* floating point macros */
+-#include <sys/features.h>	/* POSIX defs */
++#include "features.h"	/* POSIX defs */
+ 
+ #ifdef __aarch64__
+ #define MALLOC_ALIGNMENT 16
Prev by Date: wip/pcaudiolib: Use high and low water marks to set latency. Clean up.
Next by Date: (cross/retro68) rename Retro68 to retro68 per @ryoon, tks
Previous by Thread: wip/pcaudiolib: Use high and low water marks to set latency. Clean up.
Next by Thread: (cross/retro68) rename Retro68 to retro68 per @ryoon, tks
Indexes:
Home | Main Index | Thread Index | Old Index