dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add extra headers for partclone

Browse Source 
Package-Manager: portage-2.2.7
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2013-12-25 21:56:21 +01:00
parent 2ca2f4899a
commit 362863c2e0
4 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys-fs/xfsprogs/ChangeLog
View File

@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
*xfsprogs-3.1.11-r1 (25 Dec 2013)
25 Dec 2013; Mario Fetka <mario.fetka@gmail.com>
+files/xfsprogs-3.1.11-sharedlibs.patch, +xfsprogs-3.1.11-r1.ebuild,
-files/xfsprogs-3.1.10-sharedlibs.patch, -xfsprogs-3.1.11.ebuild:
add extra headers for partclone
*xfsprogs-3.1.11 (31 Oct 2013) *xfsprogs-3.1.11 (31 Oct 2013)
31 Oct 2013; Mario Fetka <mario.fetka@gmail.com> 31 Oct 2013; Mario Fetka <mario.fetka@gmail.com>

6
sys-fs/xfsprogs/Manifest
View File

@ -1,6 +1,6 @@
AUX xfsprogs-3.1.10-sharedlibs.patch 3196 SHA256 1f43e032cb05286c14eed7afcbd91aa8071f0d6d5a88195910264df3529a6992 SHA512 34a0084b981923ebdc22b425d73663c18aa253a64a2f739d177ef09f21a040c18595341f3fb714221146dba5a3f6fac1add1d385099f4eb5f2a0fea6725e9181 WHIRLPOOL 7ef85484c992b20397335af85fdf5b7e9e4169c8c19aafe6782aa366971e71dc6fa27b934a5d0fc7f1887a7c557b4425872aae373944f379c82f0e1d295cba92 AUX xfsprogs-3.1.11-sharedlibs.patch 2534 SHA256 a38ac3d02a16f5e836aa097096352bc5522f8570c40acd96f391a05612fc392d SHA512 75b33b79b1819d33f1a6a4fca6527f94eb4f37d98c468d6837c26183a9cdce8e62624494325ddca79b569cc7936f5749980e7e22d87c08cb8bb4eb77feb81640 WHIRLPOOL 9fa6e548928bcab9b9daa95c9c59b1f76682b029ca24290d9ee1c9a28a8fd3536b3a952c8648a5ccaee6e5ef800dc7f69e83dc5078c59ba7f649f1273a85e4ad
AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4 AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4
DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962 DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
EBUILD xfsprogs-3.1.11.ebuild 2706 SHA256 7167b2e90b020984670ee1b89f3464ffb4f11ffd5ecd8747c21f895ac29ec611 SHA512 306119fa8b718e871f26687a0788a2b2f57896d84c1e455b9e627cf9fb9e8084a15fa23be4b2ac7055c50a7853df185b481ecc5791e3e2f938a1a09ea00e7225 WHIRLPOOL 2df6a9a916868bcc10c9d053207ffaad3cb2f9e9004444feb56c74369ff3f4579f6602b017f28796fb5e6a82723dc90c907a9c72fb4bc19fbc1c1c134b4c0003 EBUILD xfsprogs-3.1.11-r1.ebuild 2704 SHA256 3b66513c792a8bcf7923eb9aab891027f9c41cc8a3dddfebb008cf4d160f6a46 SHA512 fe9ca286786e21c1f0bc1b3a6dfb9a242fbc70c1015f6c6ccfa98d4b65d31346ada9d282356bd04a408d66ce280c592783b0ccc7448c612ffc29e0c86e9798c9 WHIRLPOOL 7ab3c4d48ff2aa23f9e14e74b2962d7f453377674e0fde1368a502cd4e5592c73e783a99cad9289efead5b9aa9ffe6edc81b77a3c5aea1e945627a6d4d0b358c
MISC ChangeLog 660 SHA256 feb16ca2941d48b6b30965b51f3489e0e16a80ccb026268b1404f9f689bc89c0 SHA512 38cea3f16219c1cf8b795fb90e0d47750c69b7e90b4c17c55941e42cba7b431352de73e270c1e9deafe9f259ccf9ed58fa727a8761df0ae358a190caae78b0b8 WHIRLPOOL e204ceb19cbabcb6913cb60bbcf013809791546262cc70b9c0baddaebb4d2e9f83ae30aefcae01a2f6d2702b8bc8ef6f16a02e73ec73921796d4544ce689dd19 MISC ChangeLog 920 SHA256 6d8b98b2b5a78150cf17786ce58bcb6d592a6bad82249e2f9ac76e329e1aad8c SHA512 a53e456d97b01011153af278520a0a6a0534df987ede72b7328d9504bb36c1df6dce4ed693154637728102973b60d6a2ac1df25b17a44815405026a8f3a1d880 WHIRLPOOL 76ee6090c19788257ea93a197750fd5d966c1156612e0ab3f25f45e9d576cf28be131b1dd395a92fd207c7747ffea64a99ff731c5bc7069a3d51bda7acfec443
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52

72
sys-fs/xfsprogs/files/xfsprogs-3.1.10-sharedlibs.patch → sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch
View File

@ -1,27 +1,35 @@
ripped from PLD Linux use libtool to do all installing. do not use the manual file install as
that'll copy files directly from the .libs/ subdir which might have rpaths
--- xfsprogs-3.1.2/libdisk/Makefile that we do not want.
+++ xfsprogs-3.1.2/libdisk/Makefile
@@ -25,8 +25,10 @@
include $(BUILDRULES)
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -25,6 +25,7 @@
install: default install: default
+ $(INSTALL_LTLIB)
install-dev: default install-dev: default
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
install-qa: install-dev install-qa: install-dev
--- xfsprogs-3.1.2/libxcmd/Makefile --- a/libhandle/Makefile
+++ xfsprogs-3.1.2/libxcmd/Makefile +++ b/libhandle/Makefile
@@ -32,6 +32,12 @@ @@ -20,7 +20,6 @@
include $(BUILDRULES)
install: default
- $(INSTALL_LTLIB)
install-dev: default
$(INSTALL_LTLIB_DEV)
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -32,6 +32,11 @@
include $(BUILDRULES) include $(BUILDRULES)
-install install-dev install-qa: default -install install-dev install-qa: default
+install: default +install: default
+ $(INSTALL_LTLIB)
+ +
+install-dev: default +install-dev: default
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
@ -29,20 +37,17 @@ ripped from PLD Linux
+install-qa: default +install-qa: default
-include .dep -include .dep
--- xfsprogs-3.1.2/libxfs/Makefile --- a/libxfs/Makefile
+++ xfsprogs-3.1.2/libxfs/Makefile +++ b/libxfs/Makefile
@@ -41,7 +41,9 @@ @@ -41,5 +41,6 @@
include $(BUILDRULES)
install: default install: default
+ $(INSTALL_LTLIB_ROOT)
install-dev: default install-dev: default
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
install-qa: default install-qa: default
--- xfsprogs-3.1.2/libxlog/Makefile --- a/libxlog/Makefile
+++ xfsprogs-3.1.2/libxlog/Makefile +++ b/libxlog/Makefile
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
CFILES = xfs_log_recover.c util.c CFILES = xfs_log_recover.c util.c
@ -52,13 +57,12 @@ ripped from PLD Linux
# don't want to link xfs_repair with a debug libxlog. # don't want to link xfs_repair with a debug libxlog.
DEBUG = -DNDEBUG DEBUG = -DNDEBUG
@@ -19,6 +21,12 @@ @@ -19,6 +21,11 @@
include $(BUILDRULES) include $(BUILDRULES)
-install install-dev install-qa: default -install install-dev install-qa: default
+install: default +install: default
+ $(INSTALL_LTLIB_ROOT)
+ +
+install-dev: default +install-dev: default
+ $(INSTALL_LTLIB_DEV) + $(INSTALL_LTLIB_DEV)
@ -66,8 +70,8 @@ ripped from PLD Linux
+install-qa: default +install-qa: default
-include .dep -include .dep
--- xfsprogs-3.1.2/Makefile --- a/Makefile
+++ xfsprogs-3.1.2/Makefile +++ b/Makefile
@@ -66,6 +66,8 @@ @@ -66,6 +66,8 @@
mkfs: libxfs mkfs: libxfs
quota: libxcmd quota: libxcmd
@ -77,26 +81,8 @@ ripped from PLD Linux
ifneq ($(ENABLE_BLKID), yes) ifneq ($(ENABLE_BLKID), yes)
mkfs: libdisk mkfs: libdisk
--- xfsprogs-3.1.2/include/buildmacros --- a/include/buildmacros
+++ xfsprogs-3.1.2/include/buildmacros +++ b/include/buildmacros
@@ -56,11 +56,13 @@
endif
ifeq ($(ENABLE_SHARED),yes)
-INSTALL_LTLIB = \
+_INSTALL_LTLIB = set -e; \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
+ ../$(INSTALL) -m 755 -d $(1); \
+ ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(1); \
+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1)
+INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR))
+INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR))
endif
# Libtool thinks the static and shared libs should be in the same dir, so
@@ -71,17 +71,9 @@ @@ -71,17 +71,9 @@
# /usr/lib. # /usr/lib.
ifeq ($(ENABLE_SHARED),yes) ifeq ($(ENABLE_SHARED),yes)

9
sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild → sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild,v 1.1 2013/10/18 08:17:44 polynomial-c Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild,v 1.1 2013/12/25 08:49:36 vapier Exp $
EAPI="4" EAPI="4"
@ -37,9 +37,8 @@ pkg_setup() {
} }
src_prepare() { src_prepare() {
epatch "${FILESDIR}"/${PN}-3.1.10-sharedlibs.patch epatch "${FILESDIR}"/${PN}-3.1.11-sharedlibs.patch
epatch "${FILESDIR}"/xfsprogs_3.1.7-1drbl.patch epatch "${FILESDIR}"/${PN}_3.1.7-1drbl.patch
sed -i \ sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@ -89,7 +88,7 @@ src_configure() {
} }
src_install() { src_install() {
emake DIST_ROOT="${ED}" install install-dev emake DIST_ROOT="${ED}" install install-{dev,qa}
# handle is for xfsdump, the rest for xfsprogs # handle is for xfsdump, the rest for xfsprogs
gen_usr_ldscript -a xfs xlog gen_usr_ldscript -a xfs xlog