[gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-make/files/, gnustep-base/gnustep-make/
commit: 89a6a9d746ad548cd7721986a12a1b1ecc96ab83
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Jul 14 12:22:02 2022 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jul 14 12:22:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a6a9d7
gnustep-base/gnustep-make: fix compressed man pages install
Closes: https://bugs.gentoo.org/732850
Signed-off-by: Bernard Cafarelli gentoo.org>
.../gnustep-make-2.9.0-no_compress_man_pages.patch | 29 ++
.../gnustep-make/gnustep-make-2.9.0.ebuild | 4 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git
a/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
new file mode 100644
index ..c013ce3a282c
--- /dev/null
+++
b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
@@ -0,0 +1,29 @@
+diff -Naur gnustep-make-2.9.0.orig/GNUmakefile.in
gnustep-make-2.9.0/GNUmakefile.in
+--- gnustep-make-2.9.0.orig/GNUmakefile.in 2021-03-21 22:56:13.0
+0100
gnustep-make-2.9.0/GNUmakefile.in 2022-07-14 14:21:10.545943581 +0200
+@@ -255,23 +255,16 @@
+ for f in $(TEST_FRAMEWORK_FILES); do \
+$(INSTALL_DATA) "$(srcdir)/TestFramework/$$f" "$(testdir)"; \
+ done)
+- $(EC)(echo "Installing (and compressing) manpages"; \
++ $(EC)(echo "Installing manpages"; \
+ "$(srcdir)/mkinstalldirs" "$(mandir)/man1" \
+ "$(mandir)/man7"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/debugapp.1"
"$(mandir)/man1"; \
+-which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/debugapp.1.gz"
&& gzip -9 -n "$(mandir)/man1/debugapp.1"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-config.1"
"$(mandir)/man1"; \
+-which gzip > /dev/null 2>&1 && rm -f
"$(mandir)/man1/gnustep-config.1.gz" && gzip -9 -n
"$(mandir)/man1/gnustep-config.1"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-tests.1"
"$(mandir)/man1"; \
+-which gzip > /dev/null 2>&1 && rm -f
"$(mandir)/man1/gnustep-tests.1.gz" && gzip -9 -n
"$(mandir)/man1/gnustep-tests.1"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/openapp.1" "$(mandir)/man1";
\
+-which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/openapp.1.gz" &&
gzip -9 -n "$(mandir)/man1/openapp.1"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/opentool.1"
"$(mandir)/man1"; \
+-which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/opentool.1.gz"
&& gzip -9 -n "$(mandir)/man1/opentool.1"; \
+ $(INSTALL_DATA) "$(srcdir)/Documentation/GNUstep.7" "$(mandir)/man7";
\
+-which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man7/GNUstep.7.gz" &&
gzip -9 -n "$(mandir)/man7/GNUstep.7"; \
+-$(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7"
"$(mandir)/man7"; \
+-which gzip > /dev/null 2>&1 && rm -f
"$(mandir)/man7/library-combo.7.gz" && gzip -9 -n
"$(mandir)/man7/library-combo.7")
++$(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7"
"$(mandir)/man7";)
+ $(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
+ echo "Stripping makefiles and shell scripts..."; \
+ cd "$(makedir)"; ./strip_makefiles.sh; \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
index 3657bdcd66fa..d50df165f623 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,6 +24,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
) )"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-no_compress_man_pages.patch )
+
pkg_setup() {
# Determine libobjc.so to use
if use libobjc2; then
[gentoo-commits] repo/gentoo:master commit in: gnustep-base/gnustep-make/files/, gnustep-base/gnustep-make/
commit: dba041e8fb2573dbef409ff9af30c63ae308a874
Author: Bernard Cafarelli gentoo org>
AuthorDate: Mon Mar 20 14:21:36 2017 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Mon Mar 20 14:21:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba041e8
gnustep-base/gnustep-make: inline libobcj.so check, bug #612840
Package-Manager: Portage-2.3.5, Repoman-2.3.2
gnustep-base/gnustep-make/files/testlibobjc.m | 10 --
gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild | 6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnustep-base/gnustep-make/files/testlibobjc.m
b/gnustep-base/gnustep-make/files/testlibobjc.m
deleted file mode 100644
index 225113c24d7..000
--- a/gnustep-base/gnustep-make/files/testlibobjc.m
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Use "gcc -Werror -Wl,-l:libobjc.so.x testlibobjc.m -o /dev/null"
- * #import generates a warning with non-objc
- */
-#import
-
-int main( int argc, const char *argv[] ) {
-printf("Linker test\n");
-return 0;
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
index 6aa6586dc58..414a690bff1 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit gnustep-base eutils prefix toolchain-funcs
+inherit gnustep-base prefix toolchain-funcs
DESCRIPTION="GNUstep Makefile Package"
HOMEPAGE="http://www.gnustep.org;
@@ -32,8 +32,8 @@ pkg_setup() {
# Find version in active gcc
for ver in {2..5};
do
- if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
- "${FILESDIR}"/testlibobjc.m -o /dev/null 2>
/dev/null;
+ if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x
objective-c \
+ - <<<$'int main() {}' -o /dev/null 2> /dev/null;
then
libobjc_version=libobjc.so.${ver}
fi
