| 1 |
commit: 4e041359e340bd03f38c40fde15be6f46809d4a8 |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Fri Aug 30 14:22:07 2013 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Fri Aug 30 14:22:07 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=4e041359 |
| 7 |
|
| 8 |
freebsd-ubin-9999_p255023: multiple fix |
| 9 |
|
| 10 |
WITHOUT_LZMA_SUPPORT=, instead freebsd-ubin-9.1-grep.patch |
| 11 |
WITHOUT_ATF=, build fails |
| 12 |
WITHOUT_ICONV=, G/FBSD has dev-libs/libiconv |
| 13 |
WITHOUT_SVN= WITHOUT_SVNLITE=, svnlite disable. |
| 14 |
WITHOUT_OPENSSH= fix file collisions |
| 15 |
|
| 16 |
--- |
| 17 |
sys-freebsd/freebsd-ubin/Manifest | 3 ++- |
| 18 |
.../files/freebsd-ubin-9999-kdump-ioctl.patch | 26 ++++++++++++++++++++++ |
| 19 |
.../freebsd-ubin/freebsd-ubin-9999_p255023.ebuild | 14 +++++++----- |
| 20 |
3 files changed, 36 insertions(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest |
| 23 |
index 36d7978..7f2939f 100644 |
| 24 |
--- a/sys-freebsd/freebsd-ubin/Manifest |
| 25 |
+++ b/sys-freebsd/freebsd-ubin/Manifest |
| 26 |
@@ -8,6 +8,7 @@ AUX freebsd-ubin-9.1-bsdar.patch 656 SHA256 86834418e478bc21918d6f310fb422dbfd0a |
| 27 |
AUX freebsd-ubin-9.1-grep.patch 549 SHA256 5ab5dafccdc0c64f07742698abe51a24ab0abe10aba7d4bd80afcf4b5a36066f SHA512 2ddec1a02064ee91a177edb78a964d37b5be14c6e92a78ba9ce0a902c40f673eb7a6449042e341dfb3f31be6bef1a19fdf735af0d32526c0891fe6d9cc060101 WHIRLPOOL 3742f0c0612d2158ce2e5afaea7fb15f3f9cbc95f702fd51ea30c0c97a5cccabdffd4b722d1cb1930b362a4d2256bce77d997a69f02304a4d187391c8f8e0734 |
| 28 |
AUX freebsd-ubin-9.1-kdump-ioctl.patch 1001 SHA256 03804b82087884efa28157b36781a746349f41164591b46b73785e0b53088e2a SHA512 aadf3a6d97c5822aa9ff0d1ad8a7bfb2d17fc3193851f864bcb847ef05fe5b7e2b852cb95aaf159194a12b26900697f089113ccb15854c8e3bdb43518de9adf8 WHIRLPOOL 904f1c9dee700cab16a6075216e85768c1a146064da10e865caa319850d400b96255f677df70b2ba1766d4d855b553ad58d74f7e139391bb841f7fc0ef39ebef |
| 29 |
AUX freebsd-ubin-9.1-minigzip.patch 336 SHA256 88ad33268fd33012d37ec3f0f915322a536a4868900aa7c19486226e96125723 SHA512 e25cb6b74b17ee3d999321701fcc5a90ab94abac8ea33a155847f99e7836f16203485618be3426e34a1a5895b7582f5f466f997986486637e52dbc0e6c225dd5 WHIRLPOOL 2fa652c4548eb5b305bafca4b788d9f19f1f52903b0e27cbf402e11bcd7ceb78bdf1dfabf79932b8e78b1bbf898308405ccc19b1ca21198446889c8360db24a7 |
| 30 |
+AUX freebsd-ubin-9999-kdump-ioctl.patch 1035 SHA256 327d769f3b61f8e0ae77e866733bec47cb9fe87a7602e6221ac3570c19086430 SHA512 1d60655dd69f1673c52f4a5200322aba884da6d1937b65fa3bd4802846dcc9995d830556292bb4d230cb3bdcc6ca5ab86dace8c9ffbff23e20c1c8ec2f04ade0 WHIRLPOOL e282246f04961fbdd03b23e63e85886200ddadfb76e43c000e48187fa57faef0a7fd2c0ac1e5863d5d5350d6833d776d639882bdabe666ef1df3230fb06ef91b |
| 31 |
AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 SHA512 0f06547b0b90c65466c5c032efe6563dfd32ca56175fbad0885228310f6dc5f973d3adffe93bdb35d42b8af045ecdc23d1198fd8bad0c96c46512dbedbab3059 WHIRLPOOL 853d89f6f35c91718a30c8cbd2fed72a01c01dd03b3fab28c931fd80f71394122f4e5fe240df17b524dffb91829bc0148a605e797b88827d4f5e48730790fa57 |
| 32 |
AUX freebsd-ubin-setXid.patch 3723 SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d SHA512 9edaac765405e28b123fa40b708b1ab05af3e151726e6f2b75ab1c0fd17b6c2a428a58726da999f7a63e9550bdd3e0d274ce63517717137872a7e9c77a591501 WHIRLPOOL 36fff3ad1577981b157e4311226540ee9a0eca7f5d623e27b3fbc585bc5585158c21f27c2355ac773ff190817aee2056293d3a1c0306e7743ae72a3a49d1e670 |
| 33 |
AUX locate-updatedb-cron 94 SHA256 ef062eb2e780b6c323a904c0e1cf8fc911954d05a0194033b37419003f64f14c SHA512 17ff44684621a20c75536013d0e34057b671f0cb37d989ed9bbb080e773ae86601dca551f7fa39ee7e615226eda504e2272d86451468ef7d8a47c666537ce036 WHIRLPOOL c7d09269139e1da615b14a1f18d178c75404e8f3667c02c76fb1cb1749e05bdd90296b3ed3a79331862e7b05605b829500f710552b9d606be86115f52900d70a |
| 34 |
@@ -18,4 +19,4 @@ AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012 |
| 35 |
AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07 |
| 36 |
AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1 |
| 37 |
EBUILD freebsd-ubin-9.9999.ebuild 5366 SHA256 b23db52f3f661a72d8c5da33bc8189e4c6469527c85013eacbdd809a64d516e0 SHA512 4828f3313442caea34733953297a9636d824099107699cc918bdf0ff16025a0f48e5a97a6ffa1e4be34d3bde922f8bfaf7acd0e228a6a79821a05d11c258ddbe WHIRLPOOL 7e363c303c997bd12b1b3b36307f19166fb680bc78e6ec703cf9a3cd111369bd8ace07e0632bb6285ce9bdff128a36bf3fafa878de34582fd7a12014fff51e36 |
| 38 |
-EBUILD freebsd-ubin-9999_p255023.ebuild 5366 SHA256 b23db52f3f661a72d8c5da33bc8189e4c6469527c85013eacbdd809a64d516e0 SHA512 4828f3313442caea34733953297a9636d824099107699cc918bdf0ff16025a0f48e5a97a6ffa1e4be34d3bde922f8bfaf7acd0e228a6a79821a05d11c258ddbe WHIRLPOOL 7e363c303c997bd12b1b3b36307f19166fb680bc78e6ec703cf9a3cd111369bd8ace07e0632bb6285ce9bdff128a36bf3fafa878de34582fd7a12014fff51e36 |
| 39 |
+EBUILD freebsd-ubin-9999_p255023.ebuild 5448 SHA256 a9179f05e955ed1184d0cc054cd200ba07e879f9d9d2aa5834187c8733672ff5 SHA512 e3a53921d7d1f45089f1ec3abc19932b0813d5bec6c675b30a573c1f195c1824437e633325b2c0f7f48a187aae1e4499f60fcfdfdc429c3bc5c7083bf2127a5b WHIRLPOOL 249a0fa2bf6a2834d6ffca56ef81ef185260491f3f1aa88d3c5d5858185a60bed6da21f3d9fdefdc5f426497c2a8ca7f3357c2220b58f42acc6cbde69ff45905 |
| 40 |
|
| 41 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-kdump-ioctl.patch |
| 42 |
new file mode 100644 |
| 43 |
index 0000000..ae05376 |
| 44 |
--- /dev/null |
| 45 |
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9999-kdump-ioctl.patch |
| 46 |
@@ -0,0 +1,26 @@ |
| 47 |
+diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile |
| 48 |
+index f19bd16..6d134e6 100644 |
| 49 |
+--- a/usr.bin/kdump/Makefile |
| 50 |
++++ b/usr.bin/kdump/Makefile |
| 51 |
+@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c |
| 52 |
+ |
| 53 |
+ ioctl.c: mkioctls |
| 54 |
+ env MACHINE=${MACHINE} CPP="${CPP}" \ |
| 55 |
+- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} |
| 56 |
++ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../usr/include > ${.TARGET} |
| 57 |
+ |
| 58 |
+ kdump_subr.h: mksubr |
| 59 |
+ sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ |
| 60 |
+diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile |
| 61 |
+index a5eff14..c9d4442 100644 |
| 62 |
+--- a/usr.bin/truss/Makefile |
| 63 |
++++ b/usr.bin/truss/Makefile |
| 64 |
+@@ -24,7 +24,7 @@ syscalls.h: syscalls.master |
| 65 |
+ |
| 66 |
+ ioctl.c: ${.CURDIR}/../kdump/mkioctls |
| 67 |
+ env MACHINE=${MACHINE} CPP="${CPP}" \ |
| 68 |
+- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} |
| 69 |
++ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../usr/include > ${.TARGET} |
| 70 |
+ |
| 71 |
+ .if ${MACHINE_CPUARCH} == "i386" |
| 72 |
+ SRCS+= i386-linux.c linux_syscalls.h |
| 73 |
|
| 74 |
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild |
| 75 |
index 8c99a78..d21e096 100644 |
| 76 |
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild |
| 77 |
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9999_p255023.ebuild |
| 78 |
@@ -48,12 +48,9 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
| 79 |
"${FILESDIR}/${PN}-9.0-fixmakefiles.patch" |
| 80 |
"${FILESDIR}/${PN}-setXid.patch" |
| 81 |
"${FILESDIR}/${PN}-lint-stdarg.patch" |
| 82 |
- "${FILESDIR}/${PN}-9.1-kdump-ioctl.patch" |
| 83 |
"${FILESDIR}/${PN}-8.0-xinstall.patch" |
| 84 |
"${FILESDIR}/${PN}-9.1-bsdar.patch" |
| 85 |
- "${FILESDIR}/${PN}-9.1-minigzip.patch" |
| 86 |
- "${FILESDIR}/${PN}-9.1-grep.patch" |
| 87 |
- "${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" ) |
| 88 |
+ "${FILESDIR}/${PN}-9.1-minigzip.patch" ) |
| 89 |
|
| 90 |
# Here we remove some sources we don't need because they are already |
| 91 |
# provided by portage's packages or similar. In order: |
| 92 |
@@ -65,6 +62,10 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
| 93 |
# - binutils gprof |
| 94 |
# - dc stuff |
| 95 |
# and the rest are misc utils we already provide somewhere else. |
| 96 |
+ |
| 97 |
+# fix later |
| 98 |
+# gcc-4.6 build fails, dtc |
| 99 |
+# build fails, kdump mandoc truss xlint |
| 100 |
REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
| 101 |
gzip gprof |
| 102 |
lzmainfo xz xzdec |
| 103 |
@@ -76,7 +77,8 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
| 104 |
compile_et lex vi smbutil file vacation nc ftp telnet |
| 105 |
c99 c89 |
| 106 |
bc dc |
| 107 |
- whois tftp man" |
| 108 |
+ whois tftp man |
| 109 |
+ dtc kdump mandoc truss xlint" |
| 110 |
|
| 111 |
pkg_setup() { |
| 112 |
use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 113 |
@@ -89,7 +91,7 @@ pkg_setup() { |
| 114 |
use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
| 115 |
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
| 116 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
| 117 |
- mymakeopts="${mymakeopts} WITHOUT_CLANG= " |
| 118 |
+ mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_ATF= WITHOUT_ICONV= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= " |
| 119 |
} |
| 120 |
|
| 121 |
pkg_preinst() { |
Archives