pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/simh
Module Name: pkgsrc
Committed By: rhialto
Date: Tue Oct 19 20:34:48 UTC 2021
Modified Files:
pkgsrc/emulators/simh: Makefile distinfo
pkgsrc/emulators/simh/patches: patch-makefile
Log Message:
emulators/simh: now hopefully works on MacOS.
Networking seemed to not crash for my test case (MacOS 11.6).
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/emulators/simh/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/emulators/simh/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/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/simh/Makefile
diff -u pkgsrc/emulators/simh/Makefile:1.57 pkgsrc/emulators/simh/Makefile:1.58
--- pkgsrc/emulators/simh/Makefile:1.57 Thu Oct 14 19:12:55 2021
+++ pkgsrc/emulators/simh/Makefile Tue Oct 19 20:34:48 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2021/10/14 19:12:55 rhialto Exp $
+# $NetBSD: Makefile,v 1.58 2021/10/19 20:34:48 rhialto Exp $
DISTNAME= simh-4.0.0
PKGNAME= simh-4.0.0.20211012
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
GITHUB_PROJECT= simh
@@ -20,6 +21,13 @@ BUILDLINK_API_DEPENDS.libpcap+= libpcap>
.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+# Doesn't seem to work with pkgsrc pcap, and dylib path is hardcoded.
+PREFER.libpcap= native
+# Link error with the native version: _zlibVersion
+PREFER.zlib= pkgsrc
+.endif
+
BUILDLINK_TRANSFORM+= rm:-flto
BUILDLINK_TRANSFORM+= rm:-fwhole-program
@@ -55,10 +63,11 @@ LIBRARIES= ${PREFIX:Q}/lib:\
MAKE_ENV+= INCLUDES=${INCLUDES:Q}
MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
MAKE_ENV+= GCC=${CC:Q}
-MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
-MAKE_ENV+= FONTPATH=/usr/pkg/share/fonts/X11/TTF
+MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+= FONTPATH=${PREFIX}/share/fonts/X11/TTF
+
+BUILD_MAKE_FLAGS= TESTS=0
-BUILD_TARGET= TESTS=0 all
post-extract:
${MKDIR} ${WRKSRC}/BIN
Index: pkgsrc/emulators/simh/distinfo
diff -u pkgsrc/emulators/simh/distinfo:1.33 pkgsrc/emulators/simh/distinfo:1.34
--- pkgsrc/emulators/simh/distinfo:1.33 Thu Oct 14 19:12:55 2021
+++ pkgsrc/emulators/simh/distinfo Tue Oct 19 20:34:48 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2021/10/14 19:12:55 rhialto Exp $
+$NetBSD: distinfo,v 1.34 2021/10/19 20:34:48 rhialto Exp $
RMD160 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 139a3ac95eefbfb6c2298c24386d02f832dffe94
SHA512 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 30a2ef10225a7c6a07829ddf7f559748eb8bb42bd4e2e6430da8547642063ff6b1a0729101d80e470259f8607411a1b2a3baa51ec69bac7d1ba4d99ca83a4b3e
Size (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 29376656 bytes
-SHA1 (patch-makefile) = b9142225e4d19ef8d7223f6fdf342aa51c9a2e75
+SHA1 (patch-makefile) = 03834ab4dabb39ef4d9b275b29a0722ca5dadbac
Index: pkgsrc/emulators/simh/patches/patch-makefile
diff -u pkgsrc/emulators/simh/patches/patch-makefile:1.4 pkgsrc/emulators/simh/patches/patch-makefile:1.5
--- pkgsrc/emulators/simh/patches/patch-makefile:1.4 Thu Oct 14 19:12:56 2021
+++ pkgsrc/emulators/simh/patches/patch-makefile Tue Oct 19 20:34:48 2021
@@ -1,13 +1,14 @@
-$NetBSD: patch-makefile,v 1.4 2021/10/14 19:12:56 rhialto Exp $
+$NetBSD: patch-makefile,v 1.5 2021/10/19 20:34:48 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.
-Make -O2 conditional so can be overridden by environment
-Fix png16 detection
+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 2021-10-07 06:38:08.000000000 +0000
+--- makefile.orig 2021-10-13 01:53:56.000000000 +0000
+++ makefile
@@ -298,7 +298,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)
@@ -18,6 +19,174 @@ Fix png16 detection
PCAPLIB = pcap
ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO
+@@ -339,16 +339,16 @@ ifeq (${WIN32},) #*nix Environments (&&
+ ifeq (Darwin,$(OSTYPE))
+ OSNAME = OSX
+ LIBEXT = dylib
+- ifneq (include,$(findstring include,$(UNSUPPORTED_BUILD)))
+- INCPATH:=$(shell LANG=C; ${GCC} -x c -v -E /dev/null 2>&1 | grep -A 10 '> search starts here' | grep '^ ' | grep -v 'framework directory' | tr -d '\n')
+- endif
++ #ifneq (include,$(findstring include,$(UNSUPPORTED_BUILD)))
++ INCPATH+=$(shell LANG=C; ${GCC} -x c -v -E /dev/null 2>&1 | grep -A 10 '> search starts here' | grep '^ ' | grep -v 'framework directory' | tr -d '\n')
++ #endif
+ ifeq (incopt,$(shell if ${TEST} -d /opt/local/include; then echo incopt; fi))
+- INCPATH += /opt/local/include
+- OS_CCDEFS += -I/opt/local/include
++ # INCPATH += /opt/local/include
++ # OS_CCDEFS += -I/opt/local/include
+ endif
+ ifeq (libopt,$(shell if ${TEST} -d /opt/local/lib; then echo libopt; fi))
+- LIBPATH += /opt/local/lib
+- OS_LDFLAGS += -L/opt/local/lib
++ # LIBPATH += /opt/local/lib
++ # OS_LDFLAGS += -L/opt/local/lib
+ 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))
+@@ -356,8 +356,8 @@ ifeq (${WIN32},) #*nix Environments (&&
+ else
+ HBPATH = /opt/homebrew
+ endif
+- INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/include))
+- LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/lib))
++ # INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/include))
++ # LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/lib))
+ endif
+ else
+ ifeq (Linux,$(OSTYPE))
+@@ -367,15 +367,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))
+- LIBPATH += ${PREFIX}/lib
++ # LIBPATH += ${PREFIX}/lib
+ endif
+ ifneq (,$(shell if ${TEST} -d /system/lib; then echo systemlib; fi))
+- LIBPATH += /system/lib
++ # LIBPATH += /system/lib
+ endif
+- LIBPATH += $(LD_LIBRARY_PATH)
++ # LIBPATH += $(LD_LIBRARY_PATH)
+ endif
+ ifeq (ldconfig,$(shell if ${TEST} -e /sbin/ldconfig; then echo ldconfig; fi))
+- LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
++ # LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
+ endif
+ endif
+ LIBEXT = so
+@@ -383,7 +383,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+ ifeq (SunOS,$(OSTYPE))
+ OSNAME = Solaris
+ ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
+- LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
++ # LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
+ endif
+ LIBEXT = so
+ OS_LDFLAGS += -lsocket -lnsl
+@@ -392,27 +392,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))
+- LIBPATH += /opt/sfw/lib
+- OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
++ # LIBPATH += /opt/sfw/lib
++ # OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
+ endif
+ OS_CCDEFS += -D_LARGEFILE_SOURCE
+ else
+ ifeq (cygwin,$(OSTYPE))
+ # use 0readme_ethernet.txt documented Windows pcap build components
+- INCPATH += ../windows-build/winpcap/WpdPack/Include
+- LIBPATH += ../windows-build/winpcap/WpdPack/Lib
++ # INCPATH += ../windows-build/winpcap/WpdPack/Include
++ # LIBPATH += ../windows-build/winpcap/WpdPack/Lib
+ PCAPLIB = wpcap
+ LIBEXT = a
+ else
+ ifneq (,$(findstring AIX,$(OSTYPE)))
+ OS_LDFLAGS += -lm -lrt
+ ifeq (incopt,$(shell if ${TEST} -d /opt/freeware/include; then echo incopt; fi))
+- INCPATH += /opt/freeware/include
+- OS_CCDEFS += -I/opt/freeware/include
++ # INCPATH += /opt/freeware/include
++ # OS_CCDEFS += -I/opt/freeware/include
+ endif
+ ifeq (libopt,$(shell if ${TEST} -d /opt/freeware/lib; then echo libopt; fi))
+- LIBPATH += /opt/freeware/lib
+- OS_LDFLAGS += -L/opt/freeware/lib
++ # LIBPATH += /opt/freeware/lib
++ # OS_LDFLAGS += -L/opt/freeware/lib
+ endif
+ else
+ ifneq (,$(findstring Haiku,$(OSTYPE)))
+@@ -423,9 +423,9 @@ ifeq (${WIN32},) #*nix Environments (&&
+ ifeq ($(HAIKU_ARCH),x86_gcc2)
+ $(error Unsupported arch x86_gcc2. Run setarch x86 and retry)
+ endif
+- INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
+- INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
+- LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
++ # INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
++ # INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
++ # LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
+ OS_LDFLAGS += -lnetwork
+ else
+ ifeq (,$(findstring NetBSD,$(OSTYPE)))
+@@ -433,7 +433,7 @@ ifeq (${WIN32},) #*nix Environments (&&
+ LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
+ endif
+ ifneq (,$(LDSEARCH))
+- LIBPATH := $(LDSEARCH)
++ # LIBPATH := $(LDSEARCH)
+ else
+ ifeq (,$(strip $(LPATH)))
+ $(info *** Warning ***)
+@@ -445,22 +445,22 @@ ifeq (${WIN32},) #*nix Environments (&&
+ $(info *** Warning *** variable.)
+ $(info *** Warning ***)
+ else
+- LIBPATH = $(subst :, ,$(LPATH))
++ # LIBPATH = $(subst :, ,$(LPATH))
+ endif
+ endif
+- OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
++ # OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
+ endif
+ endif
+ endif
+ ifeq (usrpkglib,$(shell if ${TEST} -d /usr/pkg/lib; then echo usrpkglib; fi))
+- LIBPATH += /usr/pkg/lib
+- INCPATH += /usr/pkg/include
+- OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib
+- OS_CCDEFS += -I/usr/pkg/include
++ # LIBPATH += /usr/pkg/lib
++ # INCPATH += /usr/pkg/include
++ # OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib
++ # OS_CCDEFS += -I/usr/pkg/include
+ endif
+ ifeq (/usr/local/lib,$(findstring /usr/local/lib,${LIBPATH}))
+- INCPATH += /usr/local/include
+- OS_CCDEFS += -I/usr/local/include
++ # INCPATH += /usr/local/include
++ # OS_CCDEFS += -I/usr/local/include
+ endif
+ ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))
+ LIBEXT = so
+@@ -484,12 +484,12 @@ ifeq (${WIN32},) #*nix Environments (&&
+ endif
+ ifeq (,$(filter /lib/,$(LIBPATH)))
+ ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))
+- LIBPATH += /lib/
++ # LIBPATH += /lib/
+ endif
+ endif
+ ifeq (,$(filter /usr/lib/,$(LIBPATH)))
+ ifeq (existusrlib,$(shell if $(TEST) -d /usr/lib/; then echo existusrlib; fi))
+- LIBPATH += /usr/lib/
++ # LIBPATH += /usr/lib/
+ endif
+ endif
+ export CPATH = $(subst $() $(),:,$(INCPATH))
@@ -598,9 +598,9 @@ ifeq (${WIN32},) #*nix Environments (&&
OS_CCDEFS += -DHAVE_UTIME
endif
@@ -30,17 +199,26 @@ Fix png16 detection
$(info using libpng: $(call find_lib,png) $(call find_include,png))
ifneq (,$(call find_include,zlib))
ifneq (,$(call find_lib,z))
+@@ -790,7 +790,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
+- LIBPATH += /usr/local/lib
++ # LIBPATH += /usr/local/lib
+ LIBEXT = a
+ ifneq (,$(call find_lib,$(PCAPLIB)))
+ $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
@@ -1185,11 +1185,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
endif
ifneq ($(DEBUG),)
CFLAGS_G = -g -ggdb -g3
- CFLAGS_O = -O0
-+ CFLAGS_O ?= -O0
++ CFLAGS_O += -O0
BUILD_FEATURES = - debugging support
else
ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
- CFLAGS_O = -O2 -fno-strict-overflow
-+ CFLAGS_O ?= -O2 -fno-strict-overflow
++ CFLAGS_O += -O2 -fno-strict-overflow
GCC_OPTIMIZERS_CMD = ${GCC} --help
NO_LTO = 1
else
@@ -49,7 +227,7 @@ Fix png16 detection
CFLAGS_O += -O4 -flto -fwhole-program
else
- CFLAGS_O := -O2
-+ CFLAGS_O ?= -O2
++ CFLAGS_O += -O2
endif
endif
LDFLAGS_O =
Home |
Main Index |
Thread Index |
Old Index