diff options
Diffstat (limited to 'dev-libs/zlog')
| -rw-r--r-- | dev-libs/zlog/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/zlog/files/zlog_no_static_lib.patch | 59 | ||||
| -rw-r--r-- | dev-libs/zlog/zlog-1.2.14-r1.ebuild (renamed from dev-libs/zlog/zlog-1.2.14.ebuild) | 3 |
3 files changed, 63 insertions, 2 deletions
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest index 5863c2ed388c..73bf76641e48 100644 --- a/dev-libs/zlog/Manifest +++ b/dev-libs/zlog/Manifest @@ -1,3 +1,4 @@ +AUX zlog_no_static_lib.patch 1974 BLAKE2B 67c9cc1f7c6856b44096648d36085ddf9ee41074a82ff2dfb4a3b9feb13968bb6da53797f7a63f969b3a34dd1cc2e61a36eeb63b9d78512294e8dcb9e0313f75 SHA512 fb4acd9937112bb1bd044db0446618bc098e8cf87156f792dbe98c4c6e3ca9a66f4c047639562485acf371c20d12754bbd6b233d5bdc45c28b99e67779c3d5ad DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef -EBUILD zlog-1.2.14.ebuild 630 BLAKE2B 9214e1bec48b302cfe4129f31102e903bc6a4da626d2877df0946593d7c02dc1d403b730d28bd1189f875138e036ce11b56834bf0aa153c22ed4cc047590fa86 SHA512 e59cb6eb13a0939e634f2146084b8b169800f412b44cc5baba7e50a5fc8bd6be139ac1de14fbf9adf5363aaf2ee6c030f6df87c17a5ee781711416f1d6d07d13 +EBUILD zlog-1.2.14-r1.ebuild 677 BLAKE2B 1e87dfe72852c91ff3bf2d8d0c84edb3d40502af499fa96ce666e4bc4663c6a86c1e152d44fb9990c96bf0ed487290356d0623707d0bd082200ada3711e9a0e5 SHA512 0741244fbfeb6fd95568268279a6baa0fe543a66cb9448a0ecc810c4629e21a85ed1b8868464ed6601bb84ea7b1ae7f9365c6b8a3d6cf2c35d75e31ac46d81c8 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61 diff --git a/dev-libs/zlog/files/zlog_no_static_lib.patch b/dev-libs/zlog/files/zlog_no_static_lib.patch new file mode 100644 index 000000000000..f2ad8c65a126 --- /dev/null +++ b/dev-libs/zlog/files/zlog_no_static_lib.patch @@ -0,0 +1,59 @@ +--- a/src/makefile 2020-06-05 15:29:43.926423440 +0200 ++++ b/src/makefile 2020-06-05 15:30:26.266501492 +0200 +@@ -43,8 +43,6 @@ + DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(ZLOG_MAJOR) + DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) + DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) +-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) +-STLIB_MAKE_CMD=ar rcs $(STLIBNAME) + + # Installation related variables + PREFIX?=/usr/local +@@ -78,7 +76,6 @@ + # not to mention dynamic linker .a preference... + DYLIB_MAKE_CMD=$(CC) -shared -Wl,-G,-b64 -maix64 -pthread -o $(DYLIBNAME) $(LDFLAGS) + REAL_CFLAGS+= -maix64 +- STLIB_MAKE_CMD=OBJECT_MODE=64 ar rcs $(STLIBNAME) $(DYLIB_MAJOR_NAME) + endif + + all: $(DYLIBNAME) $(BINS) +@@ -139,21 +136,17 @@ + cp -f $(DYLIBNAME) $(DYLIB_MAJOR_NAME) + cp -f $(DYLIBNAME) $(DYLIB_MINOR_NAME) + +-$(STLIBNAME): $(OBJ) +- $(STLIB_MAKE_CMD) $(OBJ) +- + dynamic: $(DYLIBNAME) +-static: $(STLIBNAME) + + # Binaries: +-zlog-chk-conf: zlog-chk-conf.o $(STLIBNAME) $(DYLIBNAME) ++zlog-chk-conf: zlog-chk-conf.o $(DYLIBNAME) + $(CC) -o $@ zlog-chk-conf.o -L. -lzlog $(REAL_LDFLAGS) + + .c.o: + $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $< + + clean: +- rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) ++ rm -rf $(DYLIBNAME) $(BINS) *.o *.gcda *.gcno *.gcov $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) + + dep: + $(CC) -MM *.c +@@ -171,14 +164,13 @@ + + INSTALL?= cp -a + +-install: $(DYLIBNAME) $(STLIBNAME) ++install: $(DYLIBNAME) + mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH) + $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH) + $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) + cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) + cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME) +- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) + + 32bit: + @echo "" diff --git a/dev-libs/zlog/zlog-1.2.14.ebuild b/dev-libs/zlog/zlog-1.2.14-r1.ebuild index 66b2ba8509c2..1d14191309cd 100644 --- a/dev-libs/zlog/zlog-1.2.14.ebuild +++ b/dev-libs/zlog/zlog-1.2.14-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" +PATCHES="${FILESDIR}/zlog_no_static_lib.patch" src_compile() { emake CC="$(tc-getCC)" |