Sun Jul 9 15:21:38 2023 UTC ()
uno: Honour CFLAGS/LDFLAGS. Should help the build on various platforms.


(nia)
diff -r1.22 -r1.23 pkgsrc/devel/uno/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/uno/distinfo
diff -r0 -r1.1 pkgsrc/devel/uno/patches/patch-makefile
cvs diff -r1.22 -r1.23 pkgsrc/devel/uno/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/uno/Makefile 2021/07/21 04:47:41 1.22
+++ pkgsrc/devel/uno/Makefile 2023/07/09 15:21:38 1.23
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.22 2021/07/21 04:47:41 fcambus Exp $ 1# $NetBSD: Makefile,v 1.23 2023/07/09 15:21:38 nia Exp $
2# 2#
3 3
4DISTNAME= uno_v213 4DISTNAME= uno_v213
5PKGNAME= uno-2.13 5PKGNAME= uno-2.13
 6PKGREVISION= 1
6CATEGORIES= devel 7CATEGORIES= devel
7MASTER_SITES= https://spinroot.com/uno/ 8MASTER_SITES= https://spinroot.com/uno/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://spinroot.com/uno/ 11HOMEPAGE= https://spinroot.com/uno/
11COMMENT= Tool for source code analysis 12COMMENT= Tool for source code analysis
12 13
13WRKSRC= ${WRKDIR}/uno/src 14WRKSRC= ${WRKDIR}/uno/src
14MAKE_FILE= makefile 15MAKE_FILE= makefile
15 16
16MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
17USE_LANGUAGES= c99 18USE_LANGUAGES= c99
18USE_TOOLS+= bison gmake flex 19USE_TOOLS+= bison gmake flex
cvs diff -r1.8 -r1.9 pkgsrc/devel/uno/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/uno/distinfo 2021/10/26 10:20:07 1.8
+++ pkgsrc/devel/uno/distinfo 2023/07/09 15:21:38 1.9
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.8 2021/10/26 10:20:07 nia Exp $ 1$NetBSD: distinfo,v 1.9 2023/07/09 15:21:38 nia Exp $
2 2
3BLAKE2s (uno_v213.tar.gz) = f58e9550eb72dfccace7a662dcf03aee73e1869d4f21271a43ea4e83326a5fee 3BLAKE2s (uno_v213.tar.gz) = f58e9550eb72dfccace7a662dcf03aee73e1869d4f21271a43ea4e83326a5fee
4SHA512 (uno_v213.tar.gz) = 07335bd4110034a2067c1958ce04de31af792ae86d78bae0d615b0ec90e9146340f7953bb5e4d22be10352c669712eac90d4164bbf2bc839b1af7c4e7adbd35a 4SHA512 (uno_v213.tar.gz) = 07335bd4110034a2067c1958ce04de31af792ae86d78bae0d615b0ec90e9146340f7953bb5e4d22be10352c669712eac90d4164bbf2bc839b1af7c4e7adbd35a
5Size (uno_v213.tar.gz) = 239127 bytes 5Size (uno_v213.tar.gz) = 239127 bytes
6SHA1 (patch-aa) = 1585fa0e6fa1c3229fbb705c046996314391c5a2 6SHA1 (patch-aa) = 1585fa0e6fa1c3229fbb705c046996314391c5a2
7SHA1 (patch-ab) = 01fe0a5fdc85e8d6103d2a9bbd8556661a84a7c8 7SHA1 (patch-ab) = 01fe0a5fdc85e8d6103d2a9bbd8556661a84a7c8
 8SHA1 (patch-makefile) = fb60e51412844aa3bebf968e01fe8505e023bd2f
File Added: pkgsrc/devel/uno/patches/patch-makefile
$NetBSD: patch-makefile,v 1.1 2023/07/09 15:21:38 nia Exp $

Honour CFLAGS/LDFLAGS.

--- makefile.orig	2007-10-27 00:33:12.000000000 +0000
+++ makefile
@@ -26,7 +26,7 @@
 BINDIR=/usr/bin/
 # note the terminal / in the above line is needed
 CC=gcc
-CFLAGS=-ansi -Wall -m32 -ggdb -DBINDIR=\"$(BINDIR)\"
+CFLAGS+=-Wall -m32 -ggdb -DBINDIR=\"$(BINDIR)\"
 
 # on PC add:
 #	-DPC
@@ -66,13 +66,13 @@ sharing:
 		uno_generic.c uno_intervals.c uno_lts.c
 
 uno:	uno.c
-	$(CC) $(CFLAGS) -o uno uno.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o uno uno.c
 
 uno_local:	c_gram.h $(OFILES) 
-	$(CC) $(CFLAGS) -o uno_local $(OFILES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o uno_local $(OFILES)
 
 uno_global:	uno_global.o uno_fcts.o
-	$(CC) $(CFLAGS) -o uno_global uno_global.o uno_fcts.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o uno_global uno_global.o uno_fcts.o
 
 c_gram.c c_gram.h:	c_gram.y tree.h symtab.h globals.h
 	bison -v -d -o c_gram.c c_gram.y	# expect 6 shift/reduce 23 reduce/reduce conflicts