pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cbmbasic: Patch Makefile



Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By:	sjmulder
Date:		Fri Jul 5 11:19:49 2019 +0200
Changeset:	ad2d34f4e6fae63d9e24db2c2a21432f0cd4905b

Modified Files:
	cbmbasic/Makefile
	cbmbasic/distinfo
Added Files:
	cbmbasic/patches/patch-Makefile

Log Message:
cbmbasic: Patch Makefile

 - Respect existing CFLAGS by appending, rather than replacing.
 - Respect LDFLAGS.
 - Remove -O3 default.

As suggested by leot@

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

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

diffstat:
 cbmbasic/Makefile               |  6 ------
 cbmbasic/distinfo               |  1 +
 cbmbasic/patches/patch-Makefile | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diffs:
diff --git a/cbmbasic/Makefile b/cbmbasic/Makefile
index 72106548ea..a76712dc87 100644
--- a/cbmbasic/Makefile
+++ b/cbmbasic/Makefile
@@ -10,12 +10,6 @@ HOMEPAGE=	https://github.com/mist64/cbmbasic/
 COMMENT=	Portable implementation of Commodore BASIC
 LICENSE=	2-clause-bsd
 
-SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	pre-configure
-SUBST_MESSAGE.makefile=	Adjust Makefile
-SUBST_FILES.makefile=	Makefile
-SUBST_SED.makefile+=	-e 's|-O3||g'
-
 INSTALLATION_DIRS+=	bin
 
 do-install:
diff --git a/cbmbasic/distinfo b/cbmbasic/distinfo
index 73e94e5a02..bde6273f41 100644
--- a/cbmbasic/distinfo
+++ b/cbmbasic/distinfo
@@ -4,3 +4,4 @@ SHA1 (cbmbasic-0.0.20141206-89093eba090d6e1c2d2b6e1cb1616dba0ce9c7f6.tar.gz) = 4
 RMD160 (cbmbasic-0.0.20141206-89093eba090d6e1c2d2b6e1cb1616dba0ce9c7f6.tar.gz) = 2b2d8b5c669ba92e133392a26993d24196027b08
 SHA512 (cbmbasic-0.0.20141206-89093eba090d6e1c2d2b6e1cb1616dba0ce9c7f6.tar.gz) = 136a87af934834f98301d47217d443e50c9e8fd0f45725105c4266795a8f7751a864008d76571cc816c913abcf9ee24e457b35c08fa178c75d4167d7193fde6b
 Size (cbmbasic-0.0.20141206-89093eba090d6e1c2d2b6e1cb1616dba0ce9c7f6.tar.gz) = 169327 bytes
+SHA1 (patch-Makefile) = bf1b3c0747f509ddb23a66021b3abe41fddcff63
diff --git a/cbmbasic/patches/patch-Makefile b/cbmbasic/patches/patch-Makefile
new file mode 100644
index 0000000000..47728eb686
--- /dev/null
+++ b/cbmbasic/patches/patch-Makefile
@@ -0,0 +1,23 @@
+$NetBSD$
+
+ - Respect existing CFLAGS by appending, rather than replacing.
+ - Respect LDFLAGS
+ - Remove -O3 default.
+
+https://github.com/mist64/cbmbasic/pull/5
+
+--- Makefile
++++ Makefile
+@@ -1,10 +1,10 @@
+ OBJS=cbmbasic.o runtime.o plugin.o console.o
+-CFLAGS=-Wall -O3
++CFLAGS+=-Wall
+ 
+ all: cbmbasic
+ 
+ cbmbasic: $(OBJS)
+-	$(CC) -o cbmbasic $(OBJS)
++	$(CC) $(LDFLAGS) -o cbmbasic $(OBJS)
+ 
+ clean:
+ 	rm -f $(OBJS) cbmbasic


Home | Main Index | Thread Index | Old Index