diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-19 15:10:47 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-19 15:10:47 +0000 |
| commit | bc3818b318d1b504af96388d391de8e65ffc491b (patch) | |
| tree | 5b58524479ca5fd7deefa4cbe5425a72cb864284 /sys-freebsd | |
| parent | eapi5 and add := dep on ocaml pacakges (diff) | |
| download | historical-bc3818b318d1b504af96388d391de8e65ffc491b.tar.gz historical-bc3818b318d1b504af96388d391de8e65ffc491b.tar.bz2 historical-bc3818b318d1b504af96388d391de8e65ffc491b.zip | |
Fix build without a previous version installed, bug #481334. Fix by Yuta SATOH
Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-cddl/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-cddl/Manifest | 10 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog index b4b97c2f11ef..6e948f34222b 100644 --- a/sys-freebsd/freebsd-cddl/ChangeLog +++ b/sys-freebsd/freebsd-cddl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-cddl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.36 2013/08/11 20:33:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.37 2013/08/19 15:10:41 aballier Exp $ + + 19 Aug 2013; Alexis Ballier <aballier@gentoo.org> + files/freebsd-cddl-9.2-underlink.patch: + Fix build without a previous version installed, bug #481334. Fix by Yuta + SATOH 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-cddl-9.2_rc1.ebuild: diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest index 627d9508e0fe..3209d15067b9 100644 --- a/sys-freebsd/freebsd-cddl/Manifest +++ b/sys-freebsd/freebsd-cddl/Manifest @@ -7,7 +7,7 @@ AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d41 AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995 AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643 -AUX freebsd-cddl-9.2-underlink.patch 924 SHA256 d60e1ce05468ed95b9179c819693f0eb3bbbf89e79fc2d1622d81858aa84bf2d SHA512 aca1093f050463d9fa3feefda73c1e150f5fff79d44079aa10d14ab972dfedcb0fec27e931972e5f518716b4bdcff0c05b66d134fffe57ee546c4e5cdc53bcea WHIRLPOOL 2257ceb51964183694dae2c561c658266f436396d3788dd76963216ce7a06dff6b6b4aa2b02508a9e2c4dc943cf580d8002947ec493dc15e97029dfbe540b22d +AUX freebsd-cddl-9.2-underlink.patch 967 SHA256 43ede354a9e0e3db0496eeccaf64a9746ea19bc2ba141be2ad6fc1b493f34e42 SHA512 8b26c0937abf9a2811d6d7842f9b236ba19435b1ea2d6f028b77bcb397cf395b555c3d5d23afeec000143709e56154d167b2acb89941bdb70d068516ec9c462b WHIRLPOOL a89f3599eac2893c01f3143f25aff8cdc1bb1f9149b33ab7b9d87aaf1a1d6df99df29d601941d3285ed51c34d3c303a59bd033e904aca53605e8b33839f88d66 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c AUX zvol.initd 955 SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467 SHA512 606f74338087cb08591fdb3ff78a1de4cf0e4ee97af7ee301f7ce0b4028b980edc78601d745ec0a9865360d308b90a52f3603b5043f135be8ffc0f4380e9023c WHIRLPOOL 88e7534ad74518e7684775e202f63dfed3c41aa51314572af412aa87a8a060b4ada918643793ac2333b46b37e469d56227559dcfbadbd0bc023d21a683c6e165 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87 @@ -35,12 +35,12 @@ DIST freebsd-ubin-9.2_rc1.tar.bz2 1917890 SHA256 73cc16ad4c588a6db307d39d7da67d9 EBUILD freebsd-cddl-8.2.ebuild 1298 SHA256 e3cfd2017e57dcca0c8797fc79ad6cc92d7987ec7c1ca39b86ce01a878affe28 SHA512 653f173a3667c56650153620d9984f4ea399459c701428c04bd267386b6fbdda69a0cfd0bf007275975dddb0aa355781e74bfcdb8486baad92d7d1c8c56ab1a2 WHIRLPOOL 5aaecd8026689bda93d79c91f6f1ab1d3892a238a2be9085f4753b540cd41e0485b2f23b243d03373fdad690cbb2611754898562ec31be478ca86d60edf66251 EBUILD freebsd-cddl-9.1.ebuild 1599 SHA256 497cc1e9850d4f973faa772a3cac857e06b339216a680c99aaec567a47357d05 SHA512 dc55ba2ec07e414b8ee86856896a3cee0b3f9011a14487c47c035e5e94ffa60b8fb6baea4ca2a66234d2ec7189d490e0304d49ac2f9455b7ab27c44172fd0662 WHIRLPOOL e1fedbedc25f0b5d3194de0e7f4e4b00bf451b8a22248babdfbb77991b7e05b90511c9ac201541b2837285c5a0ec3406e625ef4a41ec6b1c067d4aa429d7f047 EBUILD freebsd-cddl-9.2_rc1.ebuild 1604 SHA256 80f44ac6bbfe1a332d7e1325b17bf044205ac71efa3fafd92eb6868c35f97821 SHA512 75f4b3c97c14a583f8dec41c6e914c0fb3abb9530650de5e669883ace7839f3181d57ce79cfea9f8a741aa40ae1d7cc0837ac1abb2e892b25d054c3c89bba411 WHIRLPOOL bf8203769a6ab47c01ce44c9a35058cb5d8fddd01d9d52e2bbbc7c6eb2f55c7803ec5126a1096f64d4dc063ceaa9cd6e9cd7d2191790305607638fb11dbaf908 -MISC ChangeLog 5819 SHA256 435eb9e487a977ac9b1f17b019b324fd107b66fd3c3944134881d8dc015df4da SHA512 e5cc0eb7bca7174dc3d32dd3e6032f9aee63908dd0b0ca50a9996d77e8916028b900b59c4d84c16195d46af8273a4b1c41ea5bc0e8d4eb2e0ec3fde0fd772fd6 WHIRLPOOL 079e298c445e1d938798b98fe8dce079cffb0a65f5068b2c3e7a50ac33c7c967025b4d8ab809564542fe941970aa238fb74a557085a186277518c31830009867 +MISC ChangeLog 5997 SHA256 661dd71ce5384f5799ac1d132773a3db36114d51029eb0eaeca55f01fcfe5fbe SHA512 47e14a2b4bfc27b473e3fc05b40f3a158934bb04e5899e3c524c7d4319e17081e445134cf05c64d3b6701b808078e43f54fb7d67623ecf4cdf148b894b105770 WHIRLPOOL 9694f6f648d6fdca7b85fb26f3d9cb966fccd870c844726effebe7d24d75769d9903bfd644ffe16d005c3440e93b9373b165dba24859c931f217c4835e9dd610 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlIH9QsACgkQvFcC4BYPU0rUswCeIRutnBNnojt5SOXgWfBf9eV9 -LoQAoJmgvAmOK3FU0+xUqglf5/3O2uNm -=r7Wy +iEYEAREIAAYFAlISNXIACgkQvFcC4BYPU0p4tQCgowZ3mikGfaPPV5rOEn4MoMat +BOUAoIgpODeelGMIAst6ktMDlpYo5K58 +=o9L9 -----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch index 19d1e3007737..be1ff9fa4519 100644 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch +++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch @@ -1,12 +1,14 @@ diff -uNr cddl.old/lib/libzfs/Makefile cddl/lib/libzfs/Makefile --- cddl.old/lib/libzfs/Makefile 2013-08-09 17:37:00.000000000 -0400 +++ cddl/lib/libzfs/Makefile 2013-08-09 17:44:08.000000000 -0400 -@@ -8,7 +8,7 @@ +@@ -8,7 +8,9 @@ LIB= zfs DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ ${LIBZFS_CORE} -LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core +LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core -lgeom -luutil -lavl ++ ++LDFLAGS+= -L${.CURDIR}/../../lib/libavl SRCS= deviceid.c \ fsshare.c \ |