public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Aaron Bauman" <bman@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtecla/files/
Date: Sun, 24 Nov 2019 00:44:03 +0000 (UTC)	[thread overview]
Message-ID: <1574556037.ebb70d3d1d94f85fe7a17f1ced3989f86edfdf84.bman@gentoo> (raw)

commit:     ebb70d3d1d94f85fe7a17f1ced3989f86edfdf84
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Nov 21 14:30:11 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 00:40:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb70d3d

dev-libs/libtecla: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13728
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../libtecla/files/libtecla-1.6.1-LDFLAGS2.patch   | 20 ------------
 .../libtecla/files/libtecla-1.6.1-ldflags.patch    | 27 ----------------
 .../files/libtecla-1.6.1-parallel_build2.patch     | 36 ----------------------
 3 files changed, 83 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
deleted file mode 100644
index c29d3e04c48..00000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- 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-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
deleted file mode 100644
index 423e8113213..00000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-parallel_build2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
deleted file mode 100644
index 3f85f5fdb85..00000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- 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)
- 
- #-----------------------------------------------------------------------


             reply	other threads:[~2019-11-24  0:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-24  0:44 Aaron Bauman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-04-12 21:05 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtecla/files/ Andrew Savchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1574556037.ebb70d3d1d94f85fe7a17f1ced3989f86edfdf84.bman@gentoo \
    --to=bman@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox