| 1 |
commit: b38ac76db3440169aed9356f735bdf268acaa5ea |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 20:19:11 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 20:19:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b38ac76d |
| 7 |
|
| 8 |
sys-fs/xfsprogs: in tree version works |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/xfsprogs/Manifest | 1 - |
| 13 |
sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch | 11 -- |
| 14 |
.../files/xfsprogs-4.15.0-missing_includes.patch | 39 ------- |
| 15 |
.../files/xfsprogs-4.15.0-sharedlibs.patch | 114 --------------------- |
| 16 |
.../files/xfsprogs-4.9.0-underlinking.patch | 30 ------ |
| 17 |
sys-fs/xfsprogs/metadata.xml | 8 -- |
| 18 |
sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild | 97 ------------------ |
| 19 |
7 files changed, 300 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest |
| 22 |
deleted file mode 100644 |
| 23 |
index 26b7912..0000000 |
| 24 |
--- a/sys-fs/xfsprogs/Manifest |
| 25 |
+++ /dev/null |
| 26 |
@@ -1 +0,0 @@ |
| 27 |
-DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee |
| 28 |
|
| 29 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 53ba3ec..0000000 |
| 32 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,11 +0,0 @@ |
| 35 |
---- xfsprogs-4.15.0/scrub/Makefile |
| 36 |
-+++ xfsprogs-4.15.0/scrub/Makefile |
| 37 |
-@@ -25,7 +25,7 @@ |
| 38 |
- CRONTABS = xfs_scrub_all.cron |
| 39 |
- OPTIONAL_TARGETS += $(CRONTABS) |
| 40 |
- # Don't enable the crontab by default for now |
| 41 |
--CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME) |
| 42 |
-+CROND_DIR = $(PKG_DOC_DIR) |
| 43 |
- endif |
| 44 |
- |
| 45 |
- endif # scrub_prereqs |
| 46 |
|
| 47 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch |
| 48 |
deleted file mode 100644 |
| 49 |
index 5fe2776..0000000 |
| 50 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-missing_includes.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,39 +0,0 @@ |
| 53 |
-From b354707a4acae9a09264e40195ba1c3b88b562b1 Mon Sep 17 00:00:00 2001 |
| 54 |
-From: "Jory A. Pratt" <anarchy@g.o> |
| 55 |
-Date: Mon, 9 Apr 2018 11:04:54 -0500 |
| 56 |
-Subject: [PATCH] Add support for missing includes |
| 57 |
- |
| 58 |
-Signed-off-by: Jory A. Pratt <anarchy@g.o> |
| 59 |
---- |
| 60 |
- include/workqueue.h | 2 ++ |
| 61 |
- scrub/xfs_scrub.c | 1 + |
| 62 |
- 2 files changed, 3 insertions(+) |
| 63 |
- |
| 64 |
-diff --git a/include/workqueue.h b/include/workqueue.h |
| 65 |
-index b4b3541..edb2f8a 100644 |
| 66 |
---- a/include/workqueue.h |
| 67 |
-+++ b/include/workqueue.h |
| 68 |
-@@ -22,6 +22,8 @@ |
| 69 |
- #ifndef _WORKQUEUE_H_ |
| 70 |
- #define _WORKQUEUE_H_ |
| 71 |
- |
| 72 |
-+#include <pthread.h> |
| 73 |
-+ |
| 74 |
- struct workqueue; |
| 75 |
- |
| 76 |
- typedef void workqueue_func_t(struct workqueue *wq, uint32_t index, void *arg); |
| 77 |
-diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c |
| 78 |
-index ab26e63..9f33bdc 100644 |
| 79 |
---- a/scrub/xfs_scrub.c |
| 80 |
-+++ b/scrub/xfs_scrub.c |
| 81 |
-@@ -18,6 +18,7 @@ |
| 82 |
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |
| 83 |
- */ |
| 84 |
- #include <stdio.h> |
| 85 |
-+#include <paths.h> |
| 86 |
- #include <pthread.h> |
| 87 |
- #include <stdbool.h> |
| 88 |
- #include <stdlib.h> |
| 89 |
--- |
| 90 |
-2.17.0 |
| 91 |
- |
| 92 |
|
| 93 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch |
| 94 |
deleted file mode 100644 |
| 95 |
index 1080e44..0000000 |
| 96 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch |
| 97 |
+++ /dev/null |
| 98 |
@@ -1,114 +0,0 @@ |
| 99 |
---- xfsprogs-4.15.0/include/buildmacros |
| 100 |
-+++ xfsprogs-4.15.0/include/buildmacros |
| 101 |
-@@ -70,18 +70,9 @@ |
| 102 |
- # /usr/lib. |
| 103 |
- ifeq ($(ENABLE_SHARED),yes) |
| 104 |
- INSTALL_LTLIB_DEV = \ |
| 105 |
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
| 106 |
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 107 |
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
| 108 |
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
| 109 |
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
| 110 |
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
| 111 |
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ |
| 112 |
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ |
| 113 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
| 114 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
| 115 |
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
| 116 |
-- fi |
| 117 |
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \ |
| 118 |
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 119 |
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
| 120 |
- else |
| 121 |
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
| 122 |
- endif |
| 123 |
---- xfsprogs-4.15.0/libfrog/Makefile |
| 124 |
-+++ xfsprogs-4.15.0/libfrog/Makefile |
| 125 |
-@@ -5,6 +5,8 @@ |
| 126 |
- TOPDIR = .. |
| 127 |
- include $(TOPDIR)/include/builddefs |
| 128 |
- |
| 129 |
-+LTLIBS = $(LIBXFS) $(LIBBLKID) |
| 130 |
-+ |
| 131 |
- LTLIBRARY = libfrog.la |
| 132 |
- LT_CURRENT = 0 |
| 133 |
- LT_REVISION = 0 |
| 134 |
-@@ -34,6 +36,9 @@ |
| 135 |
- |
| 136 |
- include $(BUILDRULES) |
| 137 |
- |
| 138 |
--install install-dev: default |
| 139 |
-+install: default |
| 140 |
-+ |
| 141 |
-+install-dev: default |
| 142 |
-+ $(INSTALL_LTLIB_DEV) |
| 143 |
- |
| 144 |
- -include .ltdep |
| 145 |
---- xfsprogs-4.15.0/libhandle/Makefile |
| 146 |
-+++ xfsprogs-4.15.0/libhandle/Makefile |
| 147 |
-@@ -24,7 +24,6 @@ |
| 148 |
- include $(BUILDRULES) |
| 149 |
- |
| 150 |
- install: default |
| 151 |
-- $(INSTALL_LTLIB) |
| 152 |
- |
| 153 |
- install-dev: default |
| 154 |
- $(INSTALL_LTLIB_DEV) |
| 155 |
---- xfsprogs-4.15.0/libxcmd/Makefile |
| 156 |
-+++ xfsprogs-4.15.0/libxcmd/Makefile |
| 157 |
-@@ -12,6 +12,8 @@ |
| 158 |
- |
| 159 |
- CFILES = command.c input.c help.c quit.c |
| 160 |
- |
| 161 |
-+LTLIBS = $(LIBXFS) $(LIBBLKID) |
| 162 |
-+ |
| 163 |
- ifeq ($(ENABLE_READLINE),yes) |
| 164 |
- LCFLAGS += -DENABLE_READLINE |
| 165 |
- LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) |
| 166 |
-@@ -26,6 +28,9 @@ |
| 167 |
- |
| 168 |
- include $(BUILDRULES) |
| 169 |
- |
| 170 |
--install install-dev: default |
| 171 |
-+install: default |
| 172 |
-+ |
| 173 |
-+install-dev: default |
| 174 |
-+ $(INSTALL_LTLIB_DEV) |
| 175 |
- |
| 176 |
- -include .ltdep |
| 177 |
---- xfsprogs-4.15.0/libxfs/Makefile |
| 178 |
-+++ xfsprogs-4.15.0/libxfs/Makefile |
| 179 |
-@@ -151,6 +151,7 @@ |
| 180 |
- |
| 181 |
- install-dev: install |
| 182 |
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) |
| 183 |
-+ $(INSTALL_LTLIB_DEV) |
| 184 |
- |
| 185 |
- # We need to install the headers before building the dependencies. If we |
| 186 |
- # include the .ltdep file, the makefile decides that it needs to build the |
| 187 |
---- xfsprogs-4.15.0/libxlog/Makefile |
| 188 |
-+++ xfsprogs-4.15.0/libxlog/Makefile |
| 189 |
-@@ -19,6 +19,9 @@ |
| 190 |
- |
| 191 |
- include $(BUILDRULES) |
| 192 |
- |
| 193 |
--install install-dev: default |
| 194 |
-+install: default |
| 195 |
-+ |
| 196 |
-+install-dev: default |
| 197 |
-+ $(INSTALL_LTLIB_DEV) |
| 198 |
- |
| 199 |
- -include .ltdep |
| 200 |
---- xfsprogs-4.15.0/Makefile |
| 201 |
-+++ xfsprogs-4.15.0/Makefile |
| 202 |
-@@ -92,6 +92,10 @@ |
| 203 |
- mkfs: libxcmd |
| 204 |
- spaceman: libxcmd |
| 205 |
- scrub: libhandle libxcmd |
| 206 |
-+libfrog: libxfs |
| 207 |
-+libfrog-install-dev: libxfs-install-dev |
| 208 |
-+libxlog: libxfs |
| 209 |
-+libxlog-install-dev: libxfs-install-dev |
| 210 |
- |
| 211 |
- ifeq ($(HAVE_BUILDDEFS), yes) |
| 212 |
- include $(BUILDRULES) |
| 213 |
|
| 214 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch |
| 215 |
deleted file mode 100644 |
| 216 |
index e6904a5..0000000 |
| 217 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch |
| 218 |
+++ /dev/null |
| 219 |
@@ -1,30 +0,0 @@ |
| 220 |
- libxfs/Makefile | 2 +- |
| 221 |
- libxlog/Makefile | 2 ++ |
| 222 |
- 2 files changed, 3 insertions(+), 1 deletion(-) |
| 223 |
- |
| 224 |
-diff --git a/libxfs/Makefile b/libxfs/Makefile |
| 225 |
-index 6499731..00447c4 100644 |
| 226 |
---- a/libxfs/Makefile |
| 227 |
-+++ b/libxfs/Makefile |
| 228 |
-@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c |
| 229 |
- |
| 230 |
- FCFLAGS = -I. |
| 231 |
- |
| 232 |
--LTLIBS = $(LIBPTHREAD) $(LIBRT) |
| 233 |
-+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) |
| 234 |
- |
| 235 |
- # don't try linking xfs_repair with a debug libxfs. |
| 236 |
- DEBUG = -DNDEBUG |
| 237 |
-diff --git a/libxlog/Makefile b/libxlog/Makefile |
| 238 |
-index 3417eed..fda1343 100644 |
| 239 |
---- a/libxlog/Makefile |
| 240 |
-+++ b/libxlog/Makefile |
| 241 |
-@@ -12,6 +12,8 @@ LT_AGE = 0 |
| 242 |
- |
| 243 |
- CFILES = xfs_log_recover.c util.c |
| 244 |
- |
| 245 |
-+LTLIBS = $(LIBUUID) |
| 246 |
-+ |
| 247 |
- # don't want to link xfs_repair with a debug libxlog. |
| 248 |
- DEBUG = -DNDEBUG |
| 249 |
- |
| 250 |
|
| 251 |
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml |
| 252 |
deleted file mode 100644 |
| 253 |
index 4eb20a0..0000000 |
| 254 |
--- a/sys-fs/xfsprogs/metadata.xml |
| 255 |
+++ /dev/null |
| 256 |
@@ -1,8 +0,0 @@ |
| 257 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 258 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 259 |
-<pkgmetadata> |
| 260 |
- <maintainer type="project"> |
| 261 |
- <email>base-system@g.o</email> |
| 262 |
- <name>Gentoo Base System</name> |
| 263 |
- </maintainer> |
| 264 |
-</pkgmetadata> |
| 265 |
|
| 266 |
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild |
| 267 |
deleted file mode 100644 |
| 268 |
index 9eafaa2..0000000 |
| 269 |
--- a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild |
| 270 |
+++ /dev/null |
| 271 |
@@ -1,97 +0,0 @@ |
| 272 |
-# Copyright 1999-2018 Gentoo Foundation |
| 273 |
-# Distributed under the terms of the GNU General Public License v2 |
| 274 |
- |
| 275 |
-EAPI=6 |
| 276 |
- |
| 277 |
-inherit toolchain-funcs multilib systemd |
| 278 |
- |
| 279 |
-DESCRIPTION="xfs filesystem utilities" |
| 280 |
-HOMEPAGE="http://oss.sgi.com/projects/xfs/" |
| 281 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" |
| 282 |
- |
| 283 |
-LICENSE="LGPL-2.1" |
| 284 |
-SLOT="0" |
| 285 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 286 |
-IUSE="libedit nls readline static static-libs" |
| 287 |
-REQUIRED_USE="static? ( static-libs )" |
| 288 |
- |
| 289 |
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] |
| 290 |
- readline? ( sys-libs/readline:0=[static-libs(+)] ) |
| 291 |
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" |
| 292 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 293 |
- !<sys-fs/xfsdump-3" |
| 294 |
-DEPEND="${RDEPEND} |
| 295 |
- static? ( |
| 296 |
- ${LIB_DEPEND} |
| 297 |
- readline? ( sys-libs/ncurses:0=[static-libs] ) |
| 298 |
- ) |
| 299 |
- nls? ( sys-devel/gettext )" |
| 300 |
- |
| 301 |
-PATCHES=( |
| 302 |
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch |
| 303 |
- "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch |
| 304 |
- "${FILESDIR}"/${PN}-4.15.0-docdir.patch |
| 305 |
- "${FILESDIR}"/${PN}-4.15.0-missing_includes.patch |
| 306 |
-) |
| 307 |
- |
| 308 |
-pkg_setup() { |
| 309 |
- if use readline && use libedit ; then |
| 310 |
- ewarn "You have USE='readline libedit' but these are exclusive." |
| 311 |
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit." |
| 312 |
- fi |
| 313 |
-} |
| 314 |
- |
| 315 |
-src_prepare() { |
| 316 |
- default |
| 317 |
- |
| 318 |
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. |
| 319 |
- # Clear out -static from all flags since we want to link against dynamic xfs libs. |
| 320 |
- sed -i \ |
| 321 |
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |
| 322 |
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ |
| 323 |
- include/builddefs.in || die |
| 324 |
- find -name Makefile -exec \ |
| 325 |
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + |
| 326 |
- |
| 327 |
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part. |
| 328 |
- if use static && use readline ; then |
| 329 |
- sed -i \ |
| 330 |
- -e 's|-lreadline|& -lncurses|' \ |
| 331 |
- -e 's|-lblkid|& -luuid|' \ |
| 332 |
- configure || die |
| 333 |
- fi |
| 334 |
-} |
| 335 |
- |
| 336 |
-src_configure() { |
| 337 |
- export DEBUG=-DNDEBUG |
| 338 |
- export OPTIMIZER=${CFLAGS} |
| 339 |
- unset PLATFORM # if set in user env, this breaks configure |
| 340 |
- |
| 341 |
- local myconf=( |
| 342 |
- --with-crond-dir="${EPREFIX}/etc/cron.d" |
| 343 |
- --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
| 344 |
- $(use_enable nls gettext) |
| 345 |
- $(use_enable readline) |
| 346 |
- $(usex readline --disable-editline $(use_enable libedit editline)) |
| 347 |
- ) |
| 348 |
- if use static || use static-libs ; then |
| 349 |
- myconf+=( --enable-static ) |
| 350 |
- else |
| 351 |
- myconf+=( --disable-static ) |
| 352 |
- fi |
| 353 |
- |
| 354 |
- econf "${myconf[@]}" |
| 355 |
- |
| 356 |
- MAKEOPTS+=" V=1" |
| 357 |
-} |
| 358 |
- |
| 359 |
-src_install() { |
| 360 |
- emake DIST_ROOT="${ED}" install |
| 361 |
- # parallel install fails on this target for >=xfsprogs-3.2.0 |
| 362 |
- emake -j1 DIST_ROOT="${ED}" install-dev |
| 363 |
- |
| 364 |
- # handle is for xfsdump, the rest for xfsprogs |
| 365 |
- gen_usr_ldscript -a handle xcmd xfs xlog frog |
| 366 |
- # removing unnecessary .la files if not needed |
| 367 |
- use static-libs || find "${ED}" -name '*.la' -delete |
| 368 |
-} |
Archives