From: Diego Elio Pettenò Date: Thu, 10 Nov 2005 21:28:37 +0000 (+0000) Subject: Add patch from gentoo-alt overlay to use Linux soname naming on FreeBSD to avoid... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9ba583ebaaa4b718dafdfbf7a95d0fc4c6456ab;p=gentoo.git Add patch from gentoo-alt overlay to use Linux soname naming on FreeBSD to avoid linking breakage. Package-Manager: portage-2.0.53_rc7 --- diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index a784c271dceb..4af384b2b159 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.103 2005/11/10 02:46:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.104 2005/11/10 21:28:37 flameeyes Exp $ + + 10 Nov 2005; Diego Pettenò + +files/ncurses-5.5-gfbsd.patch, ncurses-5.5-r1.ebuild: + Add patch from gentoo-alt overlay to use Linux soname naming on FreeBSD to + avoid linking breakage. *ncurses-5.5-r1 (10 Nov 2005) diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index f7fc8cf664fc..2bd19b01a839 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 0edf86746761d52686203e67bb8da47d ChangeLog 16087 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64 @@ -15,3 +18,10 @@ MD5 d303a209fc62dfcb17c00343f1fc6dcb ncurses-5.4-r6.ebuild 5385 MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741 MD5 c3076137c2592607280360168b438d9c ncurses-5.5-r1.ebuild 5294 MD5 05ffcf86aeb3d3f5c9a5bfd5a72fb2d2 ncurses-5.5.ebuild 5253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDc7uSAiZjviIA2XgRArTTAJ4kW/AC8JZd8ipPd7vmDPGt7/TzZACfffCx +hC7q9GaBNetODmp05B0CgWw= +=dbPR +-----END PGP SIGNATURE----- diff --git a/sys-libs/ncurses/files/ncurses-5.5-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.5-gfbsd.patch new file mode 100644 index 000000000000..dc56c9919609 --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-5.5-gfbsd.patch @@ -0,0 +1,74 @@ +Index: ncurses-5.5/aclocal.m4 +=================================================================== +--- ncurses-5.5.orig/aclocal.m4 ++++ ncurses-5.5/aclocal.m4 +@@ -3507,7 +3507,7 @@ AC_DEFUN([CF_SHARED_OPTS], + MK_SHARED_LIB='$(LD) -shared -rdata_shared -soname `basename $[@]` -o $[@]' + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) ++ linux*|gnu*|k*bsd*-gnu|freebsd*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +@@ -3523,23 +3523,6 @@ AC_DEFUN([CF_SHARED_OPTS], + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='$(LD) -Bshareable -soname,`basename $[@].$(ABI_VERSION)` -o $[@]' + ;; +- freebsd[[45]]*) +- CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" +- MK_SHARED_LIB='$(LD) -Bshareable -soname=`basename $[@]` -o $[@]' +- test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +- +-# This doesn't work - I keep getting spurious references to needing +-# libncurses.so.5.3 when ldd says it's resolved. LOCAL_LDFLAGS2 seems to be +-# no longer used anyway. And the rpath logic isn't relative - so I have to +-# add the local and install lib-directories: +-# +-# if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then +-# LOCAL_LDFLAGS="-rpath `pwd`/lib" +-# LOCAL_LDFLAGS2="-rpath \$(libdir) $LOCAL_LDFLAGS" +-# cf_ld_rpath_opt="-rpath " +-# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS" +-# fi +- ;; + openbsd*|freebsd*) + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='$(LD) -Bshareable -o $[@]' +Index: ncurses-5.5/configure +=================================================================== +--- ncurses-5.5.orig/configure ++++ ncurses-5.5/configure +@@ -5061,7 +5061,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + MK_SHARED_LIB='$(LD) -shared -rdata_shared -soname `basename $@` -o $@' + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) ++ linux*|gnu*|k*bsd*-gnu|freebsd*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +@@ -5077,23 +5077,6 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='$(LD) -Bshareable -soname,`basename $@.$(ABI_VERSION)` -o $@' + ;; +- freebsd[45]*) +- CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" +- MK_SHARED_LIB='$(LD) -Bshareable -soname=`basename $@` -o $@' +- test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +- +-# This doesn't work - I keep getting spurious references to needing +-# libncurses.so.5.3 when ldd says it's resolved. LOCAL_LDFLAGS2 seems to be +-# no longer used anyway. And the rpath logic isn't relative - so I have to +-# add the local and install lib-directories: +-# +-# if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then +-# LOCAL_LDFLAGS="-rpath `pwd`/lib" +-# LOCAL_LDFLAGS2="-rpath \$(libdir) $LOCAL_LDFLAGS" +-# cf_ld_rpath_opt="-rpath " +-# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS" +-# fi +- ;; + openbsd*|freebsd*) + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='$(LD) -Bshareable -o $@' diff --git a/sys-libs/ncurses/ncurses-5.5-r1.ebuild b/sys-libs/ncurses/ncurses-5.5-r1.ebuild index 714eade21579..4369c6e842b2 100644 --- a/sys-libs/ncurses/ncurses-5.5-r1.ebuild +++ b/sys-libs/ncurses/ncurses-5.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r1.ebuild,v 1.1 2005/11/10 02:46:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r1.ebuild,v 1.2 2005/11/10 21:28:37 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -24,6 +24,8 @@ src_unpack() { unpack ${A} cd "${S}" [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh + + epatch "${FILESDIR}/${P}-gfbsd.patch" } src_compile() {