diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-28 16:18:56 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-28 16:18:56 +0000 |
| commit | be60ee1912e185b7239310e767fcf5e2fec179ea (patch) | |
| tree | 423a0a89951c1f011d5e69bca603a48bf73024fa /dev-libs/libedit/files | |
| parent | Stable on sparc wrt #158254 (diff) | |
| download | gentoo-2-be60ee1912e185b7239310e767fcf5e2fec179ea.tar.gz gentoo-2-be60ee1912e185b7239310e767fcf5e2fec179ea.tar.bz2 gentoo-2-be60ee1912e185b7239310e767fcf5e2fec179ea.zip | |
Split the build-system changes from the glibc changes, and add a tiny patch to build on FreeBSD, according to bug #157407.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'dev-libs/libedit/files')
3 files changed, 34 insertions, 9 deletions
diff --git a/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch b/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch index 686c3aa96da1..5d011d92de70 100644 --- a/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch +++ b/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch @@ -13,7 +13,7 @@ # For speed and debugging -#SRCS= ${OSRCS} tokenizer.c history.c readline.c -+SRCS= ${OSRCS} tokenizer.c history.c readline.c vis.c unvis.c fgetln.c strlcat.c strlcpy.c ++SRCS= ${OSRCS} tokenizer.c history.c readline.c # For protection -SRCS= editline.c tokenizer.c history.c readline.c +#SRCS= editline.c tokenizer.c history.c readline.c @@ -21,14 +21,6 @@ LIBEDITDIR?=${.CURDIR} -@@ -42,6 +44,7 @@ - CPPFLAGS+=-I. -I${.CURDIR} - CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH - CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT -+CFLAGS+=-I. -include ../glibc-bsd-glue/bsdcompat.h -I../glibc-compat -I../glibc-bsd-glue - - AHDR=vi.h emacs.h common.h - ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c @@ -51,54 +51,68 @@ SUBDIR= readline diff --git a/dev-libs/libedit/files/libedit-20061103-freebsd.patch b/dev-libs/libedit/files/libedit-20061103-freebsd.patch new file mode 100644 index 000000000000..dea35d4e122c --- /dev/null +++ b/dev-libs/libedit/files/libedit-20061103-freebsd.patch @@ -0,0 +1,16 @@ +Index: work/netbsd-cvs/sys.h +=================================================================== +--- work.orig/netbsd-cvs/sys.h ++++ work/netbsd-cvs/sys.h +@@ -44,6 +44,11 @@ + #include <sys/cdefs.h> + #endif + ++#ifdef __FreeBSD__ ++# undef __weak_reference ++# define __weak_reference(x) __attribute__((__weakref__)) ++#endif ++ + #if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) + # define __attribute__(A) + #endif diff --git a/dev-libs/libedit/files/libedit-20061103-glibc.patch b/dev-libs/libedit/files/libedit-20061103-glibc.patch new file mode 100644 index 000000000000..fdf15570428c --- /dev/null +++ b/dev-libs/libedit/files/libedit-20061103-glibc.patch @@ -0,0 +1,17 @@ +--- netbsd-cvs/Makefile ++++ libedit-uNF/Makefile +@@ -25,5 +26,5 @@ + editline.3 tok_line.3 editline.3 tok_str.3 + + # For speed and debugging +-SRCS= ${OSRCS} tokenizer.c history.c readline.c ++SRCS= ${OSRCS} tokenizer.c history.c readline.c vis.c unvis.c fgetln.c strlcat.c strlcpy.c + # For protection +@@ -42,6 +44,7 @@ + CPPFLAGS+=-I. -I${.CURDIR} + CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH + CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT ++CFLAGS+=-I. -include ../glibc-bsd-glue/bsdcompat.h -I../glibc-compat -I../glibc-bsd-glue + + AHDR=vi.h emacs.h common.h + ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c |