Update to ne-3.3.1

Changelog: https://github.com/vigna/ne/compare/3.3.0...3.3.1
This commit is contained in:
bcallah 2021-05-27 12:41:29 +00:00
parent 7f6612e95e
commit a8d4bbdf19
3 changed files with 23 additions and 18 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2020/02/29 13:44:07 bcallah Exp $
# $OpenBSD: Makefile,v 1.13 2021/05/27 12:41:29 bcallah Exp $
COMMENT = nice console editor
DISTNAME = ne-3.3.0
DISTNAME = ne-3.3.1
CATEGORIES = editors
HOMEPAGE = http://ne.di.unimi.it/

View File

@ -1,2 +1,2 @@
SHA256 (ne-3.3.0.tar.gz) = dJNqrIXqpZzX8R5Cx1aMkD3iE33VKPdYZNDIJ/Bb4b0=
SIZE (ne-3.3.0.tar.gz) = 1165853
SHA256 (ne-3.3.1.tar.gz) = 4nVTSEWefteBTJV/rYdQR8c3mETS7Iw9hjOLjeQMtv0=
SIZE (ne-3.3.1.tar.gz) = 1138072

View File

@ -1,35 +1,40 @@
$OpenBSD: patch-src_makefile,v 1.7 2020/02/29 13:44:07 bcallah Exp $
$OpenBSD: patch-src_makefile,v 1.8 2021/05/27 12:41:29 bcallah Exp $
Remove hardcoded compiler and optimiation flags.
Index: src/makefile
--- src/makefile.orig
+++ src/makefile
@@ -85,27 +85,16 @@ NE_NOWCHAR=
@@ -90,29 +90,16 @@ NE_NOWCHAR=
NE_DEBUG=
NE_TEST=
-ifeq ($(origin CC),default)
-CC=c99
-endif
-
-ifeq ($(CC),gcc)
GCCFLAGS=-std=c99 -Wall -Wno-parentheses
-endif
+GCCFLAGS=-std=c99 -Wall -Wno-parentheses -fno-strict-aliasing -Wp,-D_FORTIFY_SOURCE=2
CFLAGS=$(OPTS) $(GCCFLAGS) \
- -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__ \
-# Test for GCC
-ifneq (,$(findstring gcc,$(shell $(CC) 2>&1)))
-GCCFLAGS=-std=c99 -Wall -Wno-parentheses -fno-strict-aliasing -flto=auto -ffat-lto-objects -Wp,-D_FORTIFY_SOURCE=2
-LDFLAGS=-flto=auto
-endif
-
CFLAGS=$(GCCFLAGS) \
-D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -DHAVE_SNPRINTF \
- $(if $(NE_NOWCHAR), -DNOWCHAR,) \
- $(if $(NE_TEST), -DNE_TEST -coverage,) \
- $(if $(NE_DEBUG), -g -fsanitize=address -fsanitize=undefined,-O3 -DNDEBUG) \
- $(if $(NE_TERMCAP), -DTERMCAP,) \
- $(if $(NE_ANSI), -DTERMCAP -DANSI,)
+ -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__ -DNDEBUG
- $(if $(NE_TERMCAP), -DNE_TERMCAP,) \
- $(if $(NE_ANSI), -DNE_TERMCAP -DNE_ANSI,) \
$(OPTS)
LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)
-ne: $(OBJS) $(if $(NE_TERMCAP)$(NE_ANSI),$(TERMCAPOBJS),)
- $(CC) $(OPTS) $(LDFLAGS) $(if $(NE_TEST), -coverage,) $(if $(NE_DEBUG), -fsanitize=address -fsanitize=undefined,) $^ -lm $(LIBS) -o $(PROGRAM)
- $(CC) $(LDFLAGS) $(if $(NE_TEST), -coverage,) $(if $(NE_DEBUG), -fsanitize=address -fsanitize=undefined,) $^ $(LIBS) $(OPTS) -lm -o $(PROGRAM)
+ne: $(OBJS)
+ $(CC) $(OPTS) $(LDFLAGS) -lm -lcurses $(LIBS) -o $(PROGRAM) $(OBJS)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) $(OPTS) -lm -lcurses -o $(PROGRAM)
clean:
rm -f ne *.o *.gcda *.gcda.info *.gcno core