mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-libs/libtecla: version bump
- fix parallel build failure (bug 514506); - update to EAPI=6; - update rework patches so that they are suitable for upstream. Package-Manager: portage-2.2.28 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
This commit is contained in:
Andrew Savchenko
@@ -1,2 +1,3 @@
|
||||
DIST libtecla-1.6.1.tar.gz 518995 SHA256 21db2947bd1415070e0462673aa9bed04610946e09169fcd63e02557b0d999a1 SHA512 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7 WHIRLPOOL 409b4c1c62810f69cd2f0d08761e52f22045ee6d936aa4c69b8da99bf66319d3716def4f7411947cfc49eeb17d27178511115f50b09f25356087bfbe45ea87e8
|
||||
DIST libtecla-1.6.2.tar.gz 535977 SHA256 8c61db528364f4e88e34e79eb3730adf54e43c594cf12faf712117a6d20eb7b8 SHA512 cabfaa4ac386bceee6cd2887010af0c64b98f545ee5c2d367c3594925985df43525bfb5f028890904c66d0f767fc2cb0585a8500cbb06ffd10b7cd7a6d56adb1 WHIRLPOOL bbc6eb0cc9fa8d28a4b635dd2a40203abf43e578c5953e8a3ee219bed25bc3b5ab1ff50d9ab246f76f0b402f1b0244217c1a17a846783025bc4c0451ce04281b
|
||||
DIST libtecla-1.6.3.tar.gz 531499 SHA256 f2757cc55040859fcf8f59a0b7b26e0184a22bece44ed9568a4534a478c1ee1a SHA512 e92da3e52f1e06f731378ea8d4529865526b7816f92c3cd41a24ee8b629453564ec1995cf528928dd0673826cdd88f57e057ec0641f9c00fc9ebb255c725df6b WHIRLPOOL c70937c731152e6f9a45bf08466f9a63de88df5bc75e9119312c0defe440ae7954138f7bc0b26ecdb3d7c26635b0e71b7f9332cb4d8f0f2a077901bb0732d929
|
||||
|
||||
37
dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch
Normal file
37
dev-libs/libtecla/files/libtecla-1.6.3-ldflags.patch
Normal file
@@ -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
|
||||
9
dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch
Normal file
9
dev-libs/libtecla/files/libtecla-1.6.3-prll-build.patch
Normal file
@@ -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 $@
|
||||
26
dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch
Normal file
26
dev-libs/libtecla/files/libtecla-1.6.3-secure-runpath.patch
Normal file
@@ -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)
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
25
dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch
Normal file
25
dev-libs/libtecla/files/libtecla-1.6.3-static-libs.patch
Normal file
@@ -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="@:"
|
||||
48
dev-libs/libtecla/libtecla-1.6.3.ebuild
Normal file
48
dev-libs/libtecla/libtecla-1.6.3.ebuild
Normal file
@@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
DESCRIPTION="Tecla command-line editing library"
|
||||
HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
|
||||
SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
|
||||
|
||||
LICENSE="icu"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="static-libs"
|
||||
|
||||
DEPEND="sys-libs/ncurses:="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S=${WORKDIR}/libtecla
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.1-install.patch
|
||||
"${FILESDIR}"/${PN}-1.6.1-no-strip.patch
|
||||
"${FILESDIR}"/${PN}-1.6.3-ldflags.patch
|
||||
"${FILESDIR}"/${PN}-1.6.3-prll-build.patch
|
||||
"${FILESDIR}"/${PN}-1.6.1-prll-install.patch
|
||||
"${FILESDIR}"/${PN}-1.6.3-static-libs.patch
|
||||
"${FILESDIR}"/${PN}-1.6.3-secure-runpath.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
mv configure.in configure.ac || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable static-libs)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
OPT="" \
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
LFLAGS="$(raw-ldflags)"
|
||||
}
|
||||
Reference in New Issue
Block a user