Attachment 231728 Details for Bug 261874 – update patch

[patch] update patch

0001-Update-emulators-gxemul-to-0.7.0.patch (text/plain), 8.09 KB, created by Mitchell Clay on 2022-02-10 18:11:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mitchell Clay

Created: 2022-02-10 18:11:12 UTC

Size: 8.09 KB

patch

obsolete

>From 9a1d0b60ba06ed36b6058cfb33f38ff11a3510b0 Mon Sep 17 00:00:00 2001
>From: Mitchell Clay <mclay@astate.edu>
>Date: Thu, 10 Feb 2022 11:25:37 -0600
>Subject: [PATCH] Update emulators/gxemul to 0.7.0
>
>---
> emulators/gxemul.tgz                          | Bin 0 -> 2371 bytes
> emulators/gxemul/Makefile                     |   6 ++--
> emulators/gxemul/distinfo                     |   6 ++--
> emulators/gxemul/files/patch-configure        |  27 +++++++++++-------
> ...v__wdc.cc => patch-src_devices_dev__wdc.c} |   8 +++---
> 5 files changed, 25 insertions(+), 22 deletions(-)
> create mode 100644 emulators/gxemul.tgz
> rename emulators/gxemul/files/{patch-src_devices_dev__wdc.cc => patch-src_devices_dev__wdc.c} (79%)
>
>diff --git a/emulators/gxemul.tgz b/emulators/gxemul.tgz
>new file mode 100644
>index 0000000000000000000000000000000000000000..119700acd954077ead0be8e0337593f9c9c0adcc
>GIT binary patch
>literal 2371
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
>
>literal 0
>HcmV?d00001
>
>diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
>index 7f53d8ec6..753b69e1c 100644
>--- a/emulators/gxemul/Makefile
>+++ b/emulators/gxemul/Makefile
>@@ -1,19 +1,17 @@
> # Created by: Janni
> 
> PORTNAME=	gxemul
>-PORTVERSION=	0.6.3
>+PORTVERSION=	0.7.0
> CATEGORIES=	emulators
> MASTER_SITES=	http://gavare.se/gxemul/src/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	mclay@astate.edu
> COMMENT=	Instruction-level machine emulator
> 
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-valgrind \
>-		--without-unittests
> CONFIGURE_ENV=	CXX=${CXX} \
> 		LOCALBASE=${LOCALBASE} \
> 		PREFIX=${PREFIX}
>diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo
>index 80784d364..4dec1ab0b 100644
>--- a/emulators/gxemul/distinfo
>+++ b/emulators/gxemul/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1613553517
>-SHA256 (gxemul-0.6.3.tar.gz) = 163604d4888218e5fdbc6858b9fc1ec1607d005eadbec424f3a9663e1f2986ed
>-SIZE (gxemul-0.6.3.tar.gz) = 6024573
>+TIMESTAMP = 1644505943
>+SHA256 (gxemul-0.7.0.tar.gz) = 79c4437c6f8ca904f46d33ac36062a65fdcf4a92a248478e408ab11295cf8e83
>+SIZE (gxemul-0.7.0.tar.gz) = 5985021
>diff --git a/emulators/gxemul/files/patch-configure b/emulators/gxemul/files/patch-configure
>index 8cb11e97e..44a604ea7 100644
>--- a/emulators/gxemul/files/patch-configure
>+++ b/emulators/gxemul/files/patch-configure
>@@ -1,19 +1,19 @@
>---- configure.orig	2018-09-06 07:41:13 UTC
>+--- configure.orig	2021-04-22 18:04:21 UTC
> +++ configure
>-@@ -360,10 +360,10 @@ if [ z$NOX11 = z ]; then
>+@@ -330,10 +330,10 @@ if [ z$NOX11 = z ]; then
>  
>  	XOK=0
>  
> -	XINCLUDE=-I/usr/X11R6/include
> +	XINCLUDE=-I${LOCALBASE}/include
>- 	$CXX $CXXFLAGS _test_x11.cc -c -o _test_x11.o $XINCLUDE 2> /dev/null
>+ 	$CC $CFLAGS _test_x11.c -c -o _test_x11.o $XINCLUDE 2> /dev/null
>  
>--	XLIB="-L/usr/X11R6/lib -lX11"
>-+	XLIB="-L${LOCALBASE}/lib -lX11"
>- 	$CXX $CXXFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
>+-	XLIB="-L/usr/X11R6/lib -lX11 -Wl,-rpath,/usr/X11R6/lib"
>++	XLIB="-L${LOCALBASE}/lib -lX11 -Wl,-rpath,${LOCALBASE}/lib"
>+ 	$CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
>  
>  	if [ -x _test_x11 ]; then
>-@@ -578,22 +578,6 @@ else
>+@@ -539,27 +539,6 @@ else
>  	fi
>  fi
>  rm -f _testprog _testprog.error _testprog.stdout
>@@ -21,15 +21,20 @@
> -
> -#  -O optimization for non-debug builds. Try -O and -O3.
> -if [ ! z"$DEBUG" = zYES ]; then
>--	$CXX $CXXFLAGS -O _testprog.cc -o _testprog 2> /dev/null
>+-	printf "checking whether -O3 or -O can be used (non-DEBUG build)... "
>+-	$CC $CFLAGS -O _testprog.c -o _testprog 2> /dev/null
> -	if [ -x _testprog ]; then
> -		rm -f _testprog
>--		$CXX $CXXFLAGS -O3 _testprog.cc -o _testprog 2> /dev/null
>+-		$CC $CFLAGS -O3 _testprog.c -o _testprog 2> /dev/null
> -		if [ -x _testprog ]; then
>--			CXXFLAGS="-O3 $CXXFLAGS"
>+-			CFLAGS="-O3 $CFLAGS"
>+-			printf "yes, -O3\n"
> -		else
>--			CXXFLAGS="-O $CXXFLAGS"
>+-			CFLAGS="-O $CFLAGS"
>+-			printf "yes, -O\n"
> -		fi
>+-	else
>+-		printf "no\n"
> -	fi
> -fi
> -rm -f _testprog
>diff --git a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc b/emulators/gxemul/files/patch-src_devices_dev__wdc.c
>similarity index 79%
>rename from emulators/gxemul/files/patch-src_devices_dev__wdc.cc
>rename to emulators/gxemul/files/patch-src_devices_dev__wdc.c
>index fc9219472..113adf3b4 100644
>--- a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc
>+++ b/emulators/gxemul/files/patch-src_devices_dev__wdc.c
>@@ -1,6 +1,6 @@
>---- src/devices/dev_wdc.cc.orig	2014-08-17 08:45:12 UTC
>-+++ src/devices/dev_wdc.cc
>-@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct w
>+--- src/devices/dev_wdc.c.orig	2021-04-22 18:04:20 UTC
>++++ src/devices/dev_wdc.c
>+@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct wdc_data *d)
>  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
>  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
>  
>@@ -15,7 +15,7 @@
>  #endif
>  
>  	while (count > 0) {
>-@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct 
>+@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct wdc_data *d)
>  	uint64_t offset = 512 * (d->sector - 1
>  	    + (int64_t)d->head * d->sectors_per_track[d->drive] +
>  	    (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261874: 231728