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 1EC5F1381F3 for ; Wed, 18 Sep 2013 12:22:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3974E0B2F; Wed, 18 Sep 2013 12:22:51 +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 1A754E0B2F for ; Wed, 18 Sep 2013 12:22:50 +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 8267633EA5A for ; Wed, 18 Sep 2013 12:22:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 278F7E530A for ; Wed, 18 Sep 2013 12:22:48 +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: <1379506948.37186e58e57aa82efd9b9dc3af593f8c226f12ee.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-lib/Manifest sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch X-VCS-Directories: sys-freebsd/freebsd-lib/ sys-freebsd/freebsd-lib/files/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 37186e58e57aa82efd9b9dc3af593f8c226f12ee X-VCS-Branch: master Date: Wed, 18 Sep 2013 12:22:48 +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: ac05bae9-337a-411d-ae60-444480b34325 X-Archives-Hash: c35c7161f42b6b6a7bdb4f78ef10a311 commit: 37186e58e57aa82efd9b9dc3af593f8c226f12ee Author: Yuta SATOH gentoo gr jp> AuthorDate: Wed Sep 18 12:22:28 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Wed Sep 18 12:22:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=37186e58 update freebsd-lib-9999-atfcxx.patch --- sys-freebsd/freebsd-lib/Manifest | 2 +- .../files/freebsd-lib-9999-atfcxx.patch | 45 +++++++++++++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 9e84ef2..6cec911 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -13,7 +13,7 @@ AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414 AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77 -AUX freebsd-lib-9999-atfcxx.patch 391 SHA256 423ed9105e87d4f3d78d4e257a88dbd237706eea391a947fa6ecad11a0943e75 SHA512 bc003e3ba5d1c2006ea316b3d0b7bae8b1db6658e9a4ad593740fa2ebd3b487431601be5c56d77364bf2fdd206aafecd5ddb753e6fa534545b32f5800378117f WHIRLPOOL 8e74e446ddf074ca82b2c51b6657c270e9f16bc19ec83525fcc58242a21e2856adc0b90e9b979f4a285ddd4dd5483ad60e1a890e5cd986eb0a243aad0df0df96 +AUX freebsd-lib-9999-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2 AUX freebsd-lib-9999-liblink.patch 2074 SHA256 e138b28fbf3a131231dfce1a111cc8ae2d6922bd47332a16bab4ae7d29bb628a SHA512 701657e5ae480cecc83a28c69b27791b7ac29c0d12ca518ffae8b05b377a2c2b6fdcfa72ccefdc502d85ac476046231cee2dca3baafb721b738f6bf6f724a0b9 WHIRLPOOL f95184614ebb77535943aa8c4db3e02a75a869c0d71574721768152d8dd9c4f60268f4b5f0e60db54e3422372f1b2dfaf977623c625e89c1186b9eab6afc6b97 AUX freebsd-lib-9999-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch index 011582e..42b64b5 100644 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-atfcxx.patch @@ -1,16 +1,49 @@ +diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc +index 937187a..d5277f3 100644 +--- a/lib/atf/Makefile.inc ++++ b/lib/atf/Makefile.inc +@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' + CFLAGS+= -DATF_SHELL='"/bin/sh"' + CFLAGS+= -DATF_WORKDIR='"/tmp"' + ++CXXFLAGS+= -DHAVE_CONFIG_H ++CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' ++CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' ++CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' ++CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' ++CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' ++CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' ++CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' ++CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' ++CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' ++CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' ++CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' ++CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' ++CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' ++CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' ++CXXFLAGS+= -DATF_SHELL='"/bin/sh"' ++CXXFLAGS+= -DATF_WORKDIR='"/tmp"' ++ + WARNS?= 3 + + # vim: syntax=make diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile -index 37d6073..47cb495 100644 +index 37d6073..90a2687 100644 --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile -@@ -46,6 +46,11 @@ CFLAGS+= -I. - - CFLAGS+= -DHAVE_CONFIG_H +@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c + .PATH: ${ATF}/atf-c++ + .PATH: ${ATF}/atf-c++/detail +-CFLAGS+= -I${ATF} +-CFLAGS+= -I${.CURDIR}/../libatf-c +-CFLAGS+= -I. +CXXFLAGS+= -I${ATF} +CXXFLAGS+= -I${.CURDIR}/../libatf-c +CXXFLAGS+= -I. + +-CFLAGS+= -DHAVE_CONFIG_H +CXXFLAGS+= -DHAVE_CONFIG_H -+ + SRCS= application.cpp \ build.cpp \ - check.cpp \