pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/open-simh
Module Name: pkgsrc
Committed By: rhialto
Date: Sun Dec 11 20:28:09 UTC 2022
Modified Files:
pkgsrc/emulators/open-simh: Makefile distinfo
pkgsrc/emulators/open-simh/patches: patch-makefile
Log Message:
emulators/open-simh: update to 2022-12-02.
- Improvements mainly in AltairZ80, PDP11.
- Stop trying to disable LTO, since it is now explicitly only enabled when
LTO=1 is given.
- Allow compiler warnings for now; pkgsrc build warns about a re#define
where native build doesn't.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/open-simh/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/open-simh/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/open-simh/patches/patch-makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/emulators/open-simh/Makefile
diff -u pkgsrc/emulators/open-simh/Makefile:1.5 pkgsrc/emulators/open-simh/Makefile:1.6
--- pkgsrc/emulators/open-simh/Makefile:1.5 Sun Oct 9 18:50:44 2022
+++ pkgsrc/emulators/open-simh/Makefile Sun Dec 11 20:28:09 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2022/10/09 18:50:44 rhialto Exp $
+# $NetBSD: Makefile,v 1.6 2022/12/11 20:28:09 rhialto Exp $
DISTNAME= open-simh-4.0.0
-PKGNAME= open-simh-4.0.0.20221008
+PKGNAME= open-simh-4.0.0.20221202
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=open-simh/}
GITHUB_PROJECT= simh
-GITHUB_TAG= 3a7ec4788f919757e85b74552d2d193149ff4442
+GITHUB_TAG= ce791138b5b5365105415a9a1cf4091d6e50a43d
MAINTAINER= rhialto%NetBSD.org@localhost
HOMEPAGE= http://simh.trailing-edge.com/
@@ -27,9 +27,6 @@ PREFER.libpcap= native
PREFER.zlib= pkgsrc
.endif
-BUILDLINK_TRANSFORM+= rm:-flto
-BUILDLINK_TRANSFORM+= rm:-fwhole-program
-
.if (${MACHINE_ARCH} == "arm")
BUILDLINK_TRANSFORM+= rm:-O2
.endif
@@ -65,7 +62,8 @@ MAKE_ENV+= INCLUDES=${INCLUDES:Q}
MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
MAKE_ENV+= GCC=${CC:Q}
MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q}
-MAKE_ENV+= FONTPATH=${PREFIX}/share/fonts/X11/TTF
+MAKE_ENV+= FONTPATH=${PREFIX:Q}/share/fonts/X11/TTF
+MAKE_ENV+= WARNINGS=ALLOWED
BUILD_MAKE_FLAGS= TESTS=0
Index: pkgsrc/emulators/open-simh/distinfo
diff -u pkgsrc/emulators/open-simh/distinfo:1.3 pkgsrc/emulators/open-simh/distinfo:1.4
--- pkgsrc/emulators/open-simh/distinfo:1.3 Sun Oct 9 18:50:44 2022
+++ pkgsrc/emulators/open-simh/distinfo Sun Dec 11 20:28:09 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2022/10/09 18:50:44 rhialto Exp $
+$NetBSD: distinfo,v 1.4 2022/12/11 20:28:09 rhialto Exp $
-BLAKE2s (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) = bd38dc56668940b7a0d3bc063d7dd30aecafe90f17289ab791cbb67aa3bf68ec
-SHA512 (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) =
06f7fc9e938e8b4f2d6aa9443ee6b6e57be72ade526e9bdd86a985a3d444732eba8321caa982789d4906ace542248653a5b09a39c52078d8de0bd7afe037e039
-Size (open-simh-4.0.0-3a7ec4788f919757e85b74552d2d193149ff4442.tar.gz) = 31166851 bytes
-SHA1 (patch-makefile) = a532dde8a12d359cd66a2447ed95812cc0dd5dbe
+BLAKE2s (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) = 28151f718cf840f7f3b0f057de9079fa403545abd48354a18bc7818014a95570
+SHA512 (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) =
ee9e61ad75c77506fa64dc7bd84ef594969f31ff48ed7e74ac14794a1a20b16fa8b94fb84113e50a934a149f7a8102517881b15bdeb84e2c5417a954df367340
+Size (open-simh-4.0.0-ce791138b5b5365105415a9a1cf4091d6e50a43d.tar.gz) = 31231180 bytes
+SHA1 (patch-makefile) = 1958d111733c76b3cb1bff838278ec9cd5313dbf
Index: pkgsrc/emulators/open-simh/patches/patch-makefile
diff -u pkgsrc/emulators/open-simh/patches/patch-makefile:1.1 pkgsrc/emulators/open-simh/patches/patch-makefile:1.2
--- pkgsrc/emulators/open-simh/patches/patch-makefile:1.1 Mon Jun 6 14:20:07 2022
+++ pkgsrc/emulators/open-simh/patches/patch-makefile Sun Dec 11 20:28:09 2022
@@ -1,25 +1,12 @@
-$NetBSD: patch-makefile,v 1.1 2022/06/06 14:20:07 rhialto Exp $
+$NetBSD: patch-makefile,v 1.2 2022/12/11 20:28:09 rhialto Exp $
-Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
-Exclude -flto for clang on NetBSD
-Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
-NO_LTO=1 is in effect for gcc and clang, except Darwin.
Fix png16 detection.
Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH,
to avoid seeing non-pkgsrc libraries (except MacOS platform).
---- makefile.orig 2022-04-01 19:37:11.000000000 +0000
+--- makefile.orig 2022-12-05 17:16:52.000000000 +0000
+++ makefile
-@@ -307,7 +307,7 @@ ifeq (${WIN32},) #*nix Environments (&&
- $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
- endif
- endif
-- LTO_EXCLUDE_VERSIONS =
-+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
- PCAPLIB = pcap
- ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
- OS_CCDEFS += -D_GNU_SOURCE -DSIM_ASYNCH_IO
-@@ -348,16 +348,16 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -366,16 +366,16 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq (Darwin,$(OSTYPE))
OSNAME = OSX
LIBEXT = dylib
@@ -43,7 +30,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
ifeq (HomeBrew,$(or $(shell if ${TEST} -d /usr/local/Cellar; then echo HomeBrew; fi),$(shell if ${TEST} -d /opt/homebrew/Cellar; then echo HomeBrew; fi)))
ifeq (local,$(shell if $(TEST) -d /usr/local/Cellar; then echo local; fi))
-@@ -365,8 +365,8 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -383,8 +383,8 @@ ifeq (${WIN32},) #*nix Environments (&&
else
HBPATH = /opt/homebrew
endif
@@ -54,7 +41,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
else
ifeq (Linux,$(OSTYPE))
-@@ -376,15 +376,15 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -394,15 +394,15 @@ ifeq (${WIN32},) #*nix Environments (&&
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
ifeq (Android,$(shell uname -o))
ifneq (,$(shell if ${TEST} -d ${PREFIX}/lib; then echo prefixlib; fi))
@@ -74,7 +61,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
endif
LIBSOEXT = so
-@@ -393,7 +393,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -411,7 +411,7 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq (SunOS,$(OSTYPE))
OSNAME = Solaris
ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
@@ -83,7 +70,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
LIBEXT = so
OS_LDFLAGS += -lsocket -lnsl
-@@ -402,27 +402,27 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -420,27 +420,27 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -I/opt/sfw/include
endif
ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))
@@ -119,7 +106,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
else
ifneq (,$(findstring Haiku,$(OSTYPE)))
-@@ -433,9 +433,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -451,9 +451,9 @@ ifeq (${WIN32},) #*nix Environments (&&
ifeq ($(HAIKU_ARCH),x86_gcc2)
$(error Unsupported arch x86_gcc2. Run setarch x86 and retry)
endif
@@ -132,7 +119,7 @@ to avoid seeing non-pkgsrc libraries (ex
OS_LDFLAGS += -lnetwork
else
ifeq (,$(findstring NetBSD,$(OSTYPE)))
-@@ -443,7 +443,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -461,7 +461,7 @@ ifeq (${WIN32},) #*nix Environments (&&
LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
endif
ifneq (,$(LDSEARCH))
@@ -141,7 +128,7 @@ to avoid seeing non-pkgsrc libraries (ex
else
ifeq (,$(strip $(LPATH)))
$(info *** Warning ***)
-@@ -455,22 +455,22 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -473,22 +473,22 @@ ifeq (${WIN32},) #*nix Environments (&&
$(info *** Warning *** variable.)
$(info *** Warning ***)
else
@@ -172,7 +159,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))
LIBEXT = so
-@@ -497,12 +497,12 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -515,12 +515,12 @@ ifeq (${WIN32},) #*nix Environments (&&
endif
ifeq (,$(filter /lib/,$(LIBPATH)))
ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))
@@ -187,7 +174,7 @@ to avoid seeing non-pkgsrc libraries (ex
endif
endif
export CPATH = $(subst $() $(),:,$(INCPATH))
-@@ -611,9 +611,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -633,9 +633,9 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -DHAVE_UTIME
endif
ifneq (,$(call find_include,png))
@@ -199,7 +186,7 @@ to avoid seeing non-pkgsrc libraries (ex
$(info using libpng: $(call find_lib,png) $(call find_include,png))
ifneq (,$(call find_include,zlib))
ifneq (,$(call find_lib,z))
-@@ -803,7 +803,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+@@ -884,7 +884,7 @@ ifeq (${WIN32},) #*nix Environments (&&
NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}
$(info using libpcap: $(call find_include,pcap))
else
@@ -208,26 +195,22 @@ to avoid seeing non-pkgsrc libraries (ex
LIBEXT = a
ifneq (,$(call find_lib,$(PCAPLIB)))
$(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
-@@ -1198,11 +1198,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
- endif
+@@ -1280,15 +1280,15 @@ endif
+ OPTIMIZE ?= -O2
ifneq ($(DEBUG),)
CFLAGS_G = -g -ggdb -g3
- CFLAGS_O = -O0
+ CFLAGS_O += -O0
BUILD_FEATURES = - debugging support
+ LTO =
else
ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
-- CFLAGS_O = -O2 -fno-strict-overflow
-+ CFLAGS_O += -O2 -fno-strict-overflow
- GCC_OPTIMIZERS_CMD = ${GCC} --help
- NO_LTO = 1
+- CFLAGS_O = $(OPTIMIZE) -fno-strict-overflow
++ CFLAGS_O += $(OPTIMIZE) -fno-strict-overflow
+ GCC_OPTIMIZERS_CMD = ${GCC} --help 2>&1
else
-@@ -1210,7 +1210,7 @@ else
- ifeq (Darwin,$(OSTYPE))
- CFLAGS_O += -O4 -flto -fwhole-program
- else
-- CFLAGS_O := -O2
-+ CFLAGS_O += -O2
- endif
+- CFLAGS_O := $(OPTIMIZE)
++ CFLAGS_O += $(OPTIMIZE)
endif
LDFLAGS_O =
+ GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION)))
Home |
Main Index |
Thread Index |
Old Index