| 1 |
commit: 0744aa71b97569b82f51c23fc8164cf31f3d0382 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 26 12:55:41 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 26 12:55:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0744aa71 |
| 7 |
|
| 8 |
sys-libs/readline-8.1: add Prefix changes, bug #729980 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/729980 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
.../readline-8.0-darwin-shlib-versioning.patch | 41 ++++++++++++++++++++++ |
| 15 |
sys-libs/readline/readline-8.1.ebuild | 15 ++++++-- |
| 16 |
2 files changed, 53 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch b/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..88128008771 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-libs/readline/files/readline-8.0-darwin-shlib-versioning.patch |
| 23 |
@@ -0,0 +1,41 @@ |
| 24 |
+darwin: don't do multi-arch stuff, just build a normal shared library |
| 25 |
+ |
| 26 |
+--- a/support/shobj-conf |
| 27 |
++++ b/support/shobj-conf |
| 28 |
+@@ -180,34 +180,8 @@ |
| 29 |
+ SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' |
| 30 |
+ SHLIB_LIBSUFF='dylib' |
| 31 |
+ |
| 32 |
+- # unused at this time |
| 33 |
+- SHLIB_SONAME='$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)' |
| 34 |
+- |
| 35 |
+- case "${host_os}" in |
| 36 |
+- # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2, |
| 37 |
+- # and 10.3, respectively. |
| 38 |
+- darwin[1-7].*) |
| 39 |
+- SHOBJ_STATUS=unsupported |
| 40 |
+- SHOBJ_LDFLAGS='-dynamic' |
| 41 |
+- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v' |
| 42 |
+- ;; |
| 43 |
+- # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 |
| 44 |
+- *) |
| 45 |
+- case "${host_os}" in |
| 46 |
+- darwin[89]*|darwin1[012]*) |
| 47 |
+- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`' |
| 48 |
+- ;; |
| 49 |
+- *) # Mac OS X 10.9 (Mavericks) and later |
| 50 |
+- SHOBJ_ARCHFLAGS= |
| 51 |
+- # for 32 and 64bit universal library |
| 52 |
+- #SHOBJ_ARCHFLAGS='-arch i386 -arch x86_64' |
| 53 |
+- #SHOBJ_CFLAGS=${SHOBJ_CFLAGS}' -arch i386 -arch x86_64' |
| 54 |
+- ;; |
| 55 |
+- esac |
| 56 |
+- SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup ${SHOBJ_ARCHFLAGS}" |
| 57 |
+- SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -v' |
| 58 |
+- ;; |
| 59 |
+- esac |
| 60 |
++ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup' |
| 61 |
++ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/`basename $@ $(SHLIB_MINOR)$(SHLIB_DOT)$(SHLIB_LIBSUFF)`$(SHLIB_DOT)$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR)' |
| 62 |
+ |
| 63 |
+ SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 |
| 64 |
+ ;; |
| 65 |
|
| 66 |
diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild |
| 67 |
index 025bd0395bd..1fbdc060022 100644 |
| 68 |
--- a/sys-libs/readline/readline-8.1.ebuild |
| 69 |
+++ b/sys-libs/readline/readline-8.1.ebuild |
| 70 |
@@ -42,7 +42,7 @@ esac |
| 71 |
LICENSE="GPL-3" |
| 72 |
SLOT="0/8" # subslot matches SONAME major |
| 73 |
[[ "${PV}" == *_rc* ]] || \ |
| 74 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 75 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 76 |
IUSE="static-libs +unicode utils" |
| 77 |
|
| 78 |
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]" |
| 79 |
@@ -58,6 +58,7 @@ PATCHES=( |
| 80 |
"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
| 81 |
"${FILESDIR}"/${PN}-7.0-headers.patch |
| 82 |
"${FILESDIR}"/${PN}-8.0-headers.patch |
| 83 |
+ "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch |
| 84 |
) |
| 85 |
|
| 86 |
# Needed because we don't want the patches being unpacked |
| 87 |
@@ -168,9 +169,17 @@ multilib_src_install_all() { |
| 88 |
pkg_preinst() { |
| 89 |
# bug #29865 |
| 90 |
# Reappeared in #595324 with paludis so keeping this for now... |
| 91 |
- preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7} |
| 92 |
+ preserve_old_lib \ |
| 93 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
| 94 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
| 95 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 6) \ |
| 96 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 7) |
| 97 |
} |
| 98 |
|
| 99 |
pkg_postinst() { |
| 100 |
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7} |
| 101 |
+ preserve_old_lib_notify \ |
| 102 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
| 103 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
| 104 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 6) \ |
| 105 |
+ /$(get_libdir)/lib{history,readline}$(get_libname 7) |
| 106 |
} |
Archives