Skip to content

Sync with libedit upstream libedit-20170329-3.1.tar.gz #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mariuz wants to merge 2 commits into from
Closed

Sync with libedit upstream libedit-20170329-3.1.tar.gz #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fabd785
Sync with libedit upstream http://thrysoee.dk/editline/libedit-201703…
mariuz Apr 14, 2017
2f0bad1
Always builds with unicode (wide-char/UTF-8) support now
mariuz Apr 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builds/posix/Makefile.in.extern.editline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ libeditline : $(LIB)/libedit.a

$(LIB)/libedit.a:
AR=ar
cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared --enable-widec
cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared
$(MAKE) -C $(ROOT)/extern/editline
cp $(ROOT)/extern/editline/src/libedit.a $(LIB)

Expand Down
3 changes: 1 addition & 2 deletions extern/editline/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ src/fcns.c
src/fcns.h
src/help.c
src/help.h
src/historyn.c
src/tokenizern.c
src/vi.h
src/func.h
39 changes: 30 additions & 9 deletions extern/editline/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
* See also NetBSD changelog:
http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit

2017-03-29 Jess Thrysoee

* version-info: 0:56:0

* all: sync with upstream source

2016-09-03 Jess Thrysoee

* version-info: 0:55:0

* all: sync with upstream source

2016-06-18 Jess Thrysoee

* version-info: 0:54:0

* all: sync with upstream source

* deprecate option --enable-widec.
Upstream now always build with unicode (wide-char/UTF-8) support.

2015-03-25 Jess Thrysoee

* version-info: 0:53:0
Expand Down Expand Up @@ -139,7 +160,7 @@
2009-09-23 Jess Thrysoee
* version-info: 0:34:0

* all: apply Apple patches from:
* all: apply Apple patches from:
http://opensource.apple.com/source/libedit/libedit-11/patches

2009-09-05 Jess Thrysoee
Expand Down Expand Up @@ -194,7 +215,7 @@
information.

* examples/fileman.c: cast stat struct members, st_nlink and st_size,
appropriately (see also 'man 2 stat'). Patch by Alex Elder.
appropriately (see also 'man 2 stat'). Patch by Alex Elder.

* all: sync with upstream source. MINOR version is now 11.

Expand Down Expand Up @@ -272,7 +293,7 @@
* patches/cvs_export.sh: strlcat.c and strlcpy.c was moved to
src/common/lib/libc/string in the upstream cvs repository.

* all: sync with upstream source.
* all: sync with upstream source.

2005-10-22 Jess Thrysoee

Expand All @@ -281,7 +302,7 @@
* patches/*.patch, configure.ac: define SCCSID, undef LIBC_SCCS. Remove
fourteen cosmetic patches.

* all: sync with upstream source.
* all: sync with upstream source.

2005-09-11 Jess Thrysoee

Expand All @@ -306,19 +327,19 @@
* acinclude.m4: added EL_GETPW_R_DRAFT test and use AC_TRY_LINK instead
of AC_TRY_COMPILE. Suggested by Norihiko Murase.

* all: sync with upstream source.
* all: sync with upstream source.

2005-08-16 Jess Thrysoee

* version-info: 0:13:0

* all: sync with upstream source.
* all: sync with upstream source.

2005-08-05 Jess Thrysoee

* version-info: 0:12:0

* all: sync with upstream source.
* all: sync with upstream source.

2005-07-24 Jess Thrysoee

Expand Down Expand Up @@ -349,7 +370,7 @@

* version-info: 0:8:0

* all: sync with upstream source.
* all: sync with upstream source.

2005-06-01 Jess Thrysoee

Expand Down Expand Up @@ -393,7 +414,7 @@

* all: sync with upstream source.

* doc/Makefile.am: If mdoc2man fails, remove empty file. Patch by
* doc/Makefile.am: If mdoc2man fails, remove empty file. Patch by
Darren Tucker.

2004-10-14 Jess Thrysoee
Expand Down
38 changes: 13 additions & 25 deletions extern/editline/src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,37 @@

build_triplet = @build@
host_triplet = @host@
@WIDECHAR_TRUE@append_1 = tokenizern.c historyn.c
@append_1 =
@HAVE_STRLCPY_FALSE@append_2 = strlcpy.c
@HAVE_STRLCAT_FALSE@append_3 = strlcat.c
@HAVE_VIS_FALSE@append_4 = vis.c
@HAVE_UNVIS_FALSE@append_5 = unvis.c
@WIDECHAR_TRUE@append_6 = eln.c
@append_6 = eln.c

CONFIG_HEADER = ../config.h

SOURCES_DIST = chared.c common.c el.c emacs.c hist.c \
keymacro.c map.c chartype.c parse.c prompt.c read.c refresh.c \
search.c sig.c terminal.c tty.c vi.c fgetln.c wcsdup.c \
search.c sig.c terminal.c tty.c vi.c wcsdup.c \
tokenizer.c history.c filecomplete.c readline.c chared.h el.h \
hist.h histedit.h keymacro.h map.h chartype.h parse.h prompt.h \
read.h refresh.h search.h sig.h sys.h terminal.h tty.h vis.h \
filecomplete.h editline/readline.h strlcpy.c strlcat.c vis.c \
unvis.c eln.c
unvis.c eln.c tokenizern.c historyn.c

@HAVE_STRLCPY_FALSE@objects_1 = strlcpy.o
@HAVE_STRLCAT_FALSE@objects_2 = strlcat.o
@HAVE_VIS_FALSE@objects_3 = vis.o
@HAVE_UNVIS_FALSE@objects_4 = unvis.o
@WIDECHAR_TRUE@objects_5 = eln.o
@objects_5 = eln.o
OBJECTS1 = chared.o common.o el.o emacs.o hist.o \
keymacro.o map.o chartype.o parse.o prompt.o read.o \
refresh.o search.o sig.o terminal.o tty.o vi.o fgetln.o \
refresh.o search.o sig.o terminal.o tty.o vi.o \
wcsdup.o tokenizer.o history.o filecomplete.o readline.o \
$(objects_1) $(objects_2) $(objects_3) \
$(objects_4) $(objects_5)
@WIDECHAR_TRUE@objects_6 = tokenizern.o historyn.o
objects_7 = fcns.o help.o $(objects_6)
OBJECTS2 = $(objects_7)
objects_6 = tokenizern.o historyn.o
OBJECTS2 = $(objects_6)
OBJECTS = $(OBJECTS1) $(OBJECTS2)

DEFAULT_INCLUDES = -I. -I..
Expand Down Expand Up @@ -93,19 +92,18 @@ VERSION = @VERSION@

srcdir = .

BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h fcns.c help.c \
$(append_1)
AHDR = vi.h emacs.h common.h
BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h func.h
AHDR = vi.h emacs.h common.h
ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
CLEANFILES = $(BUILT_SOURCES)
LIBRARY = libedit.a
libedit_la_SOURCES = chared.c common.c el.c emacs.c hist.c keymacro.c \
map.c chartype.c parse.c prompt.c read.c refresh.c search.c \
sig.c terminal.c tty.c vi.c fgetln.c wcsdup.c tokenizer.c \
sig.c terminal.c tty.c vi.c wcsdup.c tokenizer.c \
history.c filecomplete.c readline.c chared.h el.h hist.h \
histedit.h keymacro.h map.h chartype.h parse.h prompt.h read.h \
refresh.h search.h sig.h sys.h terminal.h tty.h vis.h \
filecomplete.h editline/readline.h $(append_2) \
filecomplete.h editline/readline.h $(append_1) $(append_2) \
$(append_3) $(append_4) $(append_5) \
$(append_6)

Expand Down Expand Up @@ -165,22 +163,12 @@ fcns.h: Makefile $(AHDR)
help.h: Makefile $(ASRC)
AWK=$(AWK) sh $(srcdir)/makelist -bh $(ASRC) > $@

fcns.c: Makefile $(AHDR)
func.h: Makefile $(AHDR)
AWK=$(AWK) sh $(srcdir)/makelist -fc $(AHDR) > $@

help.c: Makefile $(ASRC)
AWK=$(AWK) sh $(srcdir)/makelist -bc $(ASRC) > $@

tokenizern.c: Makefile $(srcdir)/tokenizer.c
AWK=$(AWK) sh $(srcdir)/makelist -n $(srcdir)/tokenizer.c > $@

historyn.c: Makefile $(srcdir)/history.c
AWK=$(AWK) sh $(srcdir)/makelist -n $(srcdir)/history.c > $@

Dependencies = $(OBJECTS:.o=.d)
-include $(Dependencies)

# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

Loading