| 1 |
commit: f93e5c7f35ab1223383bdc90da7d2daa1e53b87b |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 15:17:06 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 15:17:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93e5c7f |
| 7 |
|
| 8 |
dev-libs/shhopt: Disable static-libs |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/723180 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/shhopt/files/shhopt-1.1.7-build.patch | 60 ++++++++++---------------- |
| 16 |
dev-libs/shhopt/shhopt-1.1.7-r3.ebuild | 3 +- |
| 17 |
2 files changed, 24 insertions(+), 39 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch |
| 20 |
index 3405511e223..954011994bc 100644 |
| 21 |
--- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch |
| 22 |
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch |
| 23 |
@@ -1,12 +1,12 @@ |
| 24 |
--- a/Makefile |
| 25 |
+++ b/Makefile |
| 26 |
-@@ -5,20 +5,15 @@ |
| 27 |
+@@ -5,17 +5,11 @@ |
| 28 |
VERPAT = 7 |
| 29 |
VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) |
| 30 |
|
| 31 |
-# Define SHARED as 1 for Linux shared ELF library |
| 32 |
-#SHARED = 1 |
| 33 |
-- |
| 34 |
+ |
| 35 |
-ifeq ($(SHARED),1) |
| 36 |
LIBTARGET = lib$(DIST).so.$(VERSION) |
| 37 |
LIBTARGETSO = lib$(DIST).so |
| 38 |
@@ -15,69 +15,55 @@ |
| 39 |
-else |
| 40 |
-LIBTARGET = lib$(DIST).a |
| 41 |
-endif |
| 42 |
-+ |
| 43 |
-+LIBTARGETA = lib$(DIST).a |
| 44 |
|
| 45 |
LIBHEAD = $(DIST).h |
| 46 |
--TARGETS = $(LIBTARGET) |
| 47 |
-+TARGETS = $(LIBTARGET) $(LIBTARGETA) |
| 48 |
- |
| 49 |
- INSTBASEDIR = /usr/local |
| 50 |
- INSTLIBDIR = $(INSTBASEDIR)/lib |
| 51 |
-@@ -27,12 +22,12 @@ |
| 52 |
+ TARGETS = $(LIBTARGET) |
| 53 |
+@@ -27,12 +21,9 @@ |
| 54 |
INSTALLPROG = install -m 755 |
| 55 |
MKDIRP = install -d -m 755 |
| 56 |
|
| 57 |
-CC = gcc |
| 58 |
-OPTIM = -O2 |
| 59 |
- |
| 60 |
--INCDIR = -I. |
| 61 |
-- |
| 62 |
+ INCDIR = -I. |
| 63 |
+ |
| 64 |
-CCOPT = -s -Wall $(OPTIM) $(INCDIR) |
| 65 |
-+CC ?= gcc |
| 66 |
-+AR ?= ar |
| 67 |
-+ARFLAGS ?= rc |
| 68 |
-+RANLIB ?= ranlib |
| 69 |
-+CPPFLAGS += -I. |
| 70 |
-+CFLAGS += -Wall |
| 71 |
++CCOPT = -Wall $(INCDIR) |
| 72 |
|
| 73 |
# Object files to store in the library |
| 74 |
LIBOBJS = shhopt.o |
| 75 |
-@@ -43,21 +38,19 @@ |
| 76 |
- # don't worry if you get ranlib not found errors. This probably means |
| 77 |
+@@ -44,12 +35,7 @@ |
| 78 |
# that your ar does an implicit ranlib and you do not need to run ranlib |
| 79 |
# separately. This error is harmless. |
| 80 |
--$(LIBTARGET): $(LIBOBJS) |
| 81 |
+ $(LIBTARGET): $(LIBOBJS) |
| 82 |
-ifeq ($(SHARED),1) |
| 83 |
- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) |
| 84 |
-else |
| 85 |
- ar rc $(LIBTARGET) $(LIBOBJS) |
| 86 |
- ranlib $(LIBTARGET) || true |
| 87 |
-endif |
| 88 |
-+$(LIBTARGET): $(LIBOBJS:.o=.lo) |
| 89 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^ |
| 90 |
-+$(LIBTARGETA): $(LIBOBJS) |
| 91 |
-+ $(AR) $(ARFLAGS) $@ $^ |
| 92 |
-+ $(RANLIB) $@ |
| 93 |
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) |
| 94 |
|
| 95 |
# Note that you may need GNU's -liberty if your libc lacks strtoul |
| 96 |
example: $(LIBTARGET) example.o |
| 97 |
- $(CC) -o example example.c \ |
| 98 |
+@@ -57,7 +43,7 @@ |
| 99 |
-L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt |
| 100 |
|
| 101 |
--.c.o: |
| 102 |
+ .c.o: |
| 103 |
- $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $< |
| 104 |
-+%.lo: %.c |
| 105 |
-+ $(COMPILE.c) $(CCSHRD) $^ -o $@ |
| 106 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(CCSHRD) -o $@ -c $(CCOPT) $< |
| 107 |
|
| 108 |
depend dep: |
| 109 |
$(CC) $(INCDIR) -MM *.c >depend |
| 110 |
-@@ -73,7 +66,7 @@ |
| 111 |
- endif |
| 112 |
+@@ -66,11 +52,9 @@ |
| 113 |
+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) |
| 114 |
+ $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) |
| 115 |
+ $(INSTALL) $(LIBHEAD) $(INSTINCDIR) |
| 116 |
+-ifeq ($(SHARED),1) |
| 117 |
+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) |
| 118 |
+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) |
| 119 |
+ echo "Now run ldconfig if necessary." |
| 120 |
+-endif |
| 121 |
|
| 122 |
clean: |
| 123 |
-- rm -f *.o core *~ depend |
| 124 |
-+ rm -f *.o *.lo *.so* *.a core *~ depend |
| 125 |
- |
| 126 |
- chmod: |
| 127 |
- chmod a+r * |
| 128 |
+ rm -f *.o core *~ depend |
| 129 |
|
| 130 |
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild |
| 131 |
index 1d63a8b89ea..3710e4d865d 100644 |
| 132 |
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild |
| 133 |
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild |
| 134 |
@@ -1,4 +1,4 @@ |
| 135 |
-# Copyright 1999-2019 Gentoo Authors |
| 136 |
+# Copyright 1999-2020 Gentoo Authors |
| 137 |
# Distributed under the terms of the GNU General Public License v2 |
| 138 |
|
| 139 |
EAPI=7 |
| 140 |
@@ -20,7 +20,6 @@ src_compile() { |
| 141 |
} |
| 142 |
|
| 143 |
src_install() { |
| 144 |
- dolib.a libshhopt.a |
| 145 |
ln -s libshhopt.so.${PV} libshhopt.so || die |
| 146 |
ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die |
| 147 |
dolib.so libshhopt.so* |
Archives