diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-27 22:39:33 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-27 22:39:33 +0000 |
| commit | 7e7b813e6109d322d053a8212d22b62f7784a3e3 (patch) | |
| tree | 0a9f2a5d954c94dc956ac899f35ce0bc5e502659 /sys-freebsd/freebsd-ubin | |
| parent | Remove redundant maintainer from metadata. (diff) | |
| download | gentoo-2-7e7b813e6109d322d053a8212d22b62f7784a3e3.tar.gz gentoo-2-7e7b813e6109d322d053a8212d22b62f7784a3e3.tar.bz2 gentoo-2-7e7b813e6109d322d053a8212d22b62f7784a3e3.zip | |
Fix build of ar with newer libarchive, bug #448510 by Yuta SATOH
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd/freebsd-ubin')
| -rw-r--r-- | sys-freebsd/freebsd-ubin/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch | 19 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild | 7 |
3 files changed, 28 insertions, 4 deletions
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog index 91476d5db6f7..4c69b8da8df5 100644 --- a/sys-freebsd/freebsd-ubin/ChangeLog +++ b/sys-freebsd/freebsd-ubin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-ubin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.85 2013/01/27 22:21:57 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.86 2013/01/27 22:39:32 aballier Exp $ + + 27 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-ubin-9.1.ebuild, + +files/freebsd-ubin-9.1-ar-libarchive3.patch: + Fix build of ar with newer libarchive, bug #448510 by Yuta SATOH 27 Jan 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-ubin-9.1_rc1.ebuild, -freebsd-ubin-9.1_rc2.ebuild, diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch new file mode 100644 index 000000000000..d4d89e12e9e1 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch @@ -0,0 +1,19 @@ +diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c +--- usr.bin.orig/ar/ar.c 2012-01-03 12:23:45.000000000 +0900 ++++ usr.bin/ar/ar.c 2012-12-25 20:50:29.000000000 +0900 +@@ -386,13 +386,13 @@ + static void + bsdar_version(void) + { +- (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version()); ++ (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string()); + exit(EX_OK); + } + + static void + ranlib_version(void) + { +- (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version()); ++ (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string()); + exit(EX_OK); + } diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild index 078f7e24b3f2..aad536e86c9a 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild,v 1.1 2013/01/27 21:28:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild,v 1.2 2013/01/27 22:39:32 aballier Exp $ EAPI=2 @@ -24,7 +24,7 @@ SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) - ar? ( app-arch/libarchive ) + ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 @@ -50,7 +50,8 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" "${FILESDIR}/${PN}-8.0-xinstall.patch" "${FILESDIR}/${PN}-9.1-bsdar.patch" "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-9.1-grep.patch" ) + "${FILESDIR}/${PN}-9.1-grep.patch" + "${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" ) # Here we remove some sources we don't need because they are already # provided by portage's packages or similar. In order: |