From f87f7e47ea52862d809124191768730ad5eb5300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Wed, 26 Apr 2023 00:54:50 -0400
Subject: [PATCH] Use uname -m for any arch genwrap doesn't know about.
---
src/build/Common.gmake | 25 +++++++++++++------------
src/syncterm/CHANGES | 1 +
src/xpdev/genwrap.h | 6 +++++-
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index 00e6298ffc..79722f14ae 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -220,36 +220,37 @@ ifneq ($(os),win32)
endif
endif
-machine := $(shell if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; fi)
-machine := $(shell if uname -m | egrep "64" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; else echo $(machine) ; fi)
+machine_uname := $(shell if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; fi)
+machine_uname := $(shell if uname -m | egrep "64" > /dev/null; then uname -m | tr "[A-Z]" "[a-z]" | tr " " "_" ; else echo $(machine_uname) ; fi)
ifeq ($(os),darwin)
- ifeq ("$(machine)","")
+ ifeq ("$(machine_uname)","")
ifeq ($(shell sysctl hw.optional.x86_64),hw.optional.x86_64: 1)
- machine := x86_64
+ machine_uname := x86_64
endif
endif
endif
-ifeq ($(machine),x86_64)
- machine := x64
+ifeq ($(machine_uname),x86_64)
+ machine_uname := x64
endif
CFLAGS += -fpic
-ifeq ($(machine),sparc64)
+ifeq ($(machine_uname),sparc64)
CFLAGS += -D__BIG_ENDIAN__
endif
-ifeq ($(machine),sun4u)
+ifeq ($(machine_uname),sun4u)
CFLAGS += -D__BIG_ENDIAN__
endif
-ifeq ($(machine),power_macintosh)
+ifeq ($(machine_uname),power_macintosh)
CFLAGS += -D__BIG_ENDIAN__
endif
-ifeq ($(machine),mac68k)
+ifeq ($(machine_uname),mac68k)
CFLAGS += -D__BIG_ENDIAN__
endif
-ifeq ($(machine),)
+ifeq ($(machine_uname),)
machine := $(os)
else
- machine := $(os).$(machine)
+ machine := $(os).$(machine_uname)
+ CFLAGS += -DUNAME_ARCHITECTURE_DESC=$(machine_uname)
endif
ifeq ($(shell if [ -f /usr/include/inttypes.h ] ; then echo YES ; fi),YES)
diff --git a/src/syncterm/CHANGES b/src/syncterm/CHANGES
index df3f956bfa..cf8fd61a52 100644
--- a/src/syncterm/CHANGES
+++ b/src/syncterm/CHANGES
@@ -15,6 +15,7 @@ On Windows, indicate "awareness" for "High DPI"
Prefer X11 mode over SDL mode
Fix scrolling with left/right margins
Resumed ZModem ETA estimation fix
+Support PPM graphics
Version 1.1
-----------
diff --git a/src/xpdev/genwrap.h b/src/xpdev/genwrap.h
index 15422c28f1..17d0a80fb6 100644
--- a/src/xpdev/genwrap.h
+++ b/src/xpdev/genwrap.h
@@ -203,7 +203,11 @@ extern "C" {
#elif defined(_M_IA64) || defined(__ia64__)
#define ARCHITECTURE_DESC "ia64"
#else
- #error "Need to describe target architecture"
+ #ifdef UNAME_ARCHITECTURE_DESC
+ #define ARCHITECTURE_DESC UNAME_ARCHITECTURE_DESC
+ #else
+ #error "Need to describe target architecture"
+ #endif
#endif
/*********************/
--
GitLab