diff options
Diffstat (limited to 'dev-libs/libtecla/files')
10 files changed, 264 insertions, 0 deletions
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch new file mode 100644 index 000000000000..c29d3e04c48e --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch @@ -0,0 +1,20 @@ + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e492136..a44371a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -165,10 +165,10 @@ CFLAGS = $(OPT) $(WARNING_FLAGS) $(DEFINES) @CFLAGS@ @SHARED_CFLAGS@ + default: $(TARGETS) + + normal: +- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) ++ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' + + reentrant: +- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) ++ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' + + demos: normal + diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-install.patch b/dev-libs/libtecla/files/libtecla-1.6.1-install.patch new file mode 100644 index 000000000000..999d46c58185 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-install.patch @@ -0,0 +1,18 @@ +diff -Naur libtecla/Makefile.in libtecla.new/Makefile.in +--- libtecla/Makefile.in 2004-10-31 15:30:57.000000000 -0500 ++++ libtecla.new/Makefile.in 2008-06-03 08:59:27.000000000 -0400 +@@ -15,10 +15,10 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-LIBDIR=@libdir@ +-INCDIR=@includedir@ +-MANDIR=@mandir@ +-BINDIR=@bindir@ ++LIBDIR=$(DESTDIR)/@libdir@ ++INCDIR=$(DESTDIR)/@includedir@ ++MANDIR=$(DESTDIR)/@mandir@ ++BINDIR=$(DESTDIR)/@bindir@ + + # Which C compiler do you want to use? + diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch new file mode 100644 index 000000000000..423e8113213d --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch @@ -0,0 +1,27 @@ +# add missing LDFLAGS to build system. +# the configure script still fails to add LDFLAGS when linking +# the libtecla shared object but since it calls ld directory +# LDFLAGS can't be used straight out of the box. + +--- libtecla/Makefile.rules ++++ libtecla/Makefile.rules +@@ -66,7 +66,7 @@ + $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS) + + enhance$(SUFFIX): $(OBJDIR)/enhance.o +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \ + $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS) + + #----------------------------------------------------------------------- +--- libtecla/configure.in ++++ libtecla/configure.in +@@ -468,7 +468,7 @@ + VERSION_OPT='' + fi + +- LINK_SHARED="$LD"' -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc' ++ LINK_SHARED="$LD"' $$(LFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc' + SHARED_CFLAGS="-fpic" + + dnl Reenable the inclusion of symbols which get undefined when POSIX_C_SOURCE diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch b/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch new file mode 100644 index 000000000000..1935c3894f76 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-no-strip.patch @@ -0,0 +1,14 @@ +# prevent build system from stripping files (bug #239877). + +diff -Naur libtecla/Makefile.in libtecla.new/Makefile.in +--- libtecla/Makefile.in 2004-10-31 15:30:57.000000000 -0500 ++++ libtecla.new/Makefile.in 2008-10-07 06:17:22.000000000 -0400 +@@ -260,7 +260,7 @@ + install_bin: $(BINDIR) $(PROGRAMS) $(PROGRAMS_R) + progs="$(PROGRAMS) $(PROGRAMS_R)"; \ + for prog in $$progs; do \ +- $(srcdir)/install-sh -c -m 755 -s $$prog $(BINDIR)/; \ ++ $(srcdir)/install-sh -c -m 755 $$prog $(BINDIR)/; \ + done + + install: install_lib install_inc install_man install_bin diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch new file mode 100644 index 000000000000..3f85f5fdb854 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch @@ -0,0 +1,36 @@ + Makefile.rules | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Makefile.rules b/Makefile.rules +index 0c2f1d1..a3960b5 100644 +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -53,20 +53,20 @@ libtecla.map.opt: $(srcdir)/libtecla.map + + demos: $(DEMO_PROGS) + +-demo$(SUFFIX): $(OBJDIR)/demo.o +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++demo$(SUFFIX): $(OBJDIR)/demo.o libtecla$(SUFFIX)$(SHARED_EXT) ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \ + $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS) + +-demo2$(SUFFIX): $(OBJDIR)/demo2.o +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++demo2$(SUFFIX): $(OBJDIR)/demo2.o libtecla$(SUFFIX)$(SHARED_EXT) ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \ + $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS) + +-demo3$(SUFFIX): $(OBJDIR)/demo3.o +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++demo3$(SUFFIX): $(OBJDIR)/demo3.o libtecla$(SUFFIX)$(SHARED_EXT) ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \ + $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS) + +-enhance$(SUFFIX): $(OBJDIR)/enhance.o +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \ ++enhance$(SUFFIX): $(OBJDIR)/enhance.o libtecla$(SUFFIX)$(SHARED_EXT) ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \ + $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS) + + #----------------------------------------------------------------------- diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch new file mode 100644 index 000000000000..1815f8571566 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.1-prll-install.patch @@ -0,0 +1,52 @@ + Makefile.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a44371a..dfd44b0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -217,7 +217,7 @@ install_inc: $(INCDIR) + + install_man: $(MANDIR) libr_man func_man prog_man misc_man file_man + +-libr_man: ++libr_man: $(MANDIR) + if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ + for template in man/libr/*.in; do \ + page=`basename "$$template" .in`; \ +@@ -225,7 +225,7 @@ libr_man: + done ; \ + fi + +-func_man: ++func_man: $(MANDIR) + if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ + for template in man/func/*.in; do \ + page=`basename "$$template" .in`; \ +@@ -233,7 +233,7 @@ func_man: + done ; \ + fi + +-prog_man: ++prog_man: $(MANDIR) + if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ + for template in man/prog/*.in; do \ + page=`basename "$$template" .in`; \ +@@ -241,7 +241,7 @@ prog_man: + done ; \ + fi + +-misc_man: ++misc_man: $(MANDIR) + if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ + for template in man/misc/*.in; do \ + page=`basename "$$template" .in`; \ +@@ -249,7 +249,7 @@ misc_man: + done ; \ + fi + +-file_man: ++file_man: $(MANDIR) + if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ + for template in man/file/*.in; do \ + page=`basename "$$template" .in`; \ diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch new file mode 100644 index 000000000000..68c9e947b987 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch @@ -0,0 +1,37 @@ +--- libtecla/Makefile.rules.orig 2014-11-10 00:36:53.000000000 +0300 ++++ libtecla/Makefile.rules 2016-04-13 10:37:36.234418914 +0300 +@@ -54,19 +54,19 @@ + demos: $(DEMO_PROGS) + + demo$(SUFFIX): $(OBJDIR)/demo.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS) + + demo2$(SUFFIX): $(OBJDIR)/demo2.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS) + + demo3$(SUFFIX): $(OBJDIR)/demo3.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS) + + enhance$(SUFFIX): $(OBJDIR)/enhance.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS) + + #----------------------------------------------------------------------- +--- libtecla/configure.in.orig 2014-11-10 01:15:29.000000000 +0300 ++++ libtecla/configure.in 2016-04-13 10:32:25.916263565 +0300 +@@ -490,7 +490,7 @@ + VERSION_OPT='' + fi + +- LINK_SHARED="$LD"' -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc' ++ LINK_SHARED="$LD"' $$(LFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc' + SHARED_CFLAGS="-fpic" + + dnl Reenable the inclusion of symbols which get undefined when POSIX_C_SOURCE diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch new file mode 100644 index 000000000000..89f30a6ea31a --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch @@ -0,0 +1,9 @@ +--- libtecla/Makefile.rules.orig 2016-04-13 11:13:10.000000000 +0300 ++++ libtecla/Makefile.rules 2016-04-13 11:17:45.628234106 +0300 +@@ -165,5 +165,5 @@ + # Include file dependencies. + #----------------------------------------------------------------------- + +-$(OBJDIR)/keytab.h: $(srcdir)/keytab.h $(srcdir)/libtecla.h ++$(OBJDIR)/keytab.h: $(srcdir)/keytab.h $(srcdir)/libtecla.h $(OBJDIR) + cp $(srcdir)/keytab.h $@ diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch new file mode 100644 index 000000000000..b62104ae1d35 --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch @@ -0,0 +1,26 @@ +--- libtecla/Makefile.rules.orig 2014-11-10 00:36:53.000000000 +0300 ++++ libtecla/Makefile.rules 2016-04-13 10:37:36.234418914 +0300 +@@ -54,19 +54,19 @@ + demos: $(DEMO_PROGS) + + demo$(SUFFIX): $(OBJDIR)/demo.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS) + + demo2$(SUFFIX): $(OBJDIR)/demo2.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS) + + demo3$(SUFFIX): $(OBJDIR)/demo3.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS) + + enhance$(SUFFIX): $(OBJDIR)/enhance.o $(TARGETS) +- LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ ++ LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS) + + #----------------------------------------------------------------------- diff --git a/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch new file mode 100644 index 000000000000..b88940e49b8b --- /dev/null +++ b/dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch @@ -0,0 +1,25 @@ +--- libtecla/configure.in.orig 2016-04-13 11:12:15.000000000 +0300 ++++ libtecla/configure.in 2016-04-13 11:43:05.632287268 +0300 +@@ -426,6 +426,9 @@ + AC_ARG_WITH(file-system, AC_HELP_STRING([--with-file-system], [Does the target have a filesystem (default=yes)]), + AC_DEFINE(WITHOUT_FILE_SYSTEM), ) + ++dnl Some users may be not interested in static libs ++AC_ARG_ENABLE([static-libs], AC_HELP_STRING([--enable-static-libs], [Enable static libs if shared libs will be also build (default=yes)])) ++ + dnl The following bourne shell case statement is where system + dnl dependencies can be added. In particular, if your system supports + dnl shared library creation, the following switch is the place to +@@ -571,7 +574,11 @@ + dnl libraries to the list of libraries to be built. + + if test "$LINK_SHARED"_ != "_"; then +- TARGET_LIBS="static shared" ++ if test "$enable_static_libs"_ != "_"; then ++ TARGET_LIBS="static shared" ++ else ++ TARGET_LIBS="shared" ++ fi + else + TARGET_LIBS="static" + LINK_SHARED="@:" |