From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8BD431381F3 for ; Fri, 6 Sep 2013 12:06:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB847E0E6A; Fri, 6 Sep 2013 12:05:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B631E0E6A for ; Fri, 6 Sep 2013 12:05:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE26433EAB5 for ; Fri, 6 Sep 2013 12:05:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 75500E468F for ; Fri, 6 Sep 2013 12:05:54 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1378469134.3e8d9bb185ca7a38bf11ffd6b9b6ecae99095d0c.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-ubin/files/, sys-freebsd/freebsd-ubin/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-mandoc.patch sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild X-VCS-Directories: sys-freebsd/freebsd-ubin/files/ sys-freebsd/freebsd-ubin/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 3e8d9bb185ca7a38bf11ffd6b9b6ecae99095d0c X-VCS-Branch: master Date: Fri, 6 Sep 2013 12:05:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a57069f7-15ee-4f35-8e82-2e69b921c1c8 X-Archives-Hash: 8f7bc4ea186ec99ad67dbc75c2c066c4 commit: 3e8d9bb185ca7a38bf11ffd6b9b6ecae99095d0c Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Sep 6 12:05:34 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Fri Sep 6 12:05:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3e8d9bb1 freebsd-ubin-9999_p255023: fix fails to build, kdump mandoc truss xlint --- .../freebsd-ubin/files/freebsd-ubin-9999-mandoc.patch | 13 +++++++++++++ sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-mandoc.patch new file mode 100644 index 0000000..c5f7706 --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-mandoc.patch @@ -0,0 +1,13 @@ +diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile +index 0995534..1bcb3e0 100644 +--- a/usr.bin/mandoc/Makefile ++++ b/usr.bin/mandoc/Makefile +@@ -1,7 +1,7 @@ + # $FreeBSD$ + + MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml +-LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a ++LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a + .PATH: ${MDOCMLDIR} + + PROG= mandoc diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild index d21e096..67d558c 100644 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild +++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild @@ -50,7 +50,8 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" "${FILESDIR}/${PN}-lint-stdarg.patch" "${FILESDIR}/${PN}-8.0-xinstall.patch" "${FILESDIR}/${PN}-9.1-bsdar.patch" - "${FILESDIR}/${PN}-9.1-minigzip.patch" ) + "${FILESDIR}/${PN}-9.1-minigzip.patch" + "${FILESDIR}/${PN}-9999-mandoc.patch" ) # Here we remove some sources we don't need because they are already # provided by portage's packages or similar. In order: @@ -65,7 +66,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" # fix later # gcc-4.6 build fails, dtc -# build fails, kdump mandoc truss xlint REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio gzip gprof lzmainfo xz xzdec @@ -78,7 +78,7 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio c99 c89 bc dc whois tftp man - dtc kdump mandoc truss xlint" + dtc" pkg_setup() { use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " @@ -118,6 +118,9 @@ src_prepare() { # Disable it here otherwise our patch wont apply use ar || dummy_mk ar + + # Preparing to build xlint + export LINT=xlint } setup_multilib_vars() { @@ -131,6 +134,11 @@ setup_multilib_vars() { } src_compile() { + # Preparing to build mandoc + cd "${WORKDIR}/lib/libmandoc" + freebsd_src_compile + + cd "${S}" local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile }