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
Download Patch File Download Diff File Expand all files Collapse all files

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
that we do not want.
--- xfsprogs-3.1.2/libdisk/Makefile
+++ 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_LTLIB)
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: install-dev
--- xfsprogs-3.1.2/libxcmd/Makefile
+++ xfsprogs-3.1.2/libxcmd/Makefile
@@ -32,6 +32,12 @@
--- a/libhandle/Makefile
+++ b/libhandle/Makefile
@@ -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)
-install install-dev install-qa: default
+install: default
+ $(INSTALL_LTLIB)
+
+install-dev: default
+ $(INSTALL_LTLIB_DEV)
@@ -29,20 +37,17 @@ ripped from PLD Linux
+install-qa: default
-include .dep
--- xfsprogs-3.1.2/libxfs/Makefile
+++ xfsprogs-3.1.2/libxfs/Makefile
@@ -41,7 +41,9 @@
include $(BUILDRULES)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -41,5 +41,6 @@
install: default
+ $(INSTALL_LTLIB_ROOT)
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: default
--- xfsprogs-3.1.2/libxlog/Makefile
+++ xfsprogs-3.1.2/libxlog/Makefile
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
@@ -12,6 +12,8 @@
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.
DEBUG = -DNDEBUG
@@ -19,6 +21,12 @@
@@ -19,6 +21,11 @@
include $(BUILDRULES)
-install install-dev install-qa: default
+install: default
+ $(INSTALL_LTLIB_ROOT)
+
+install-dev: default
+ $(INSTALL_LTLIB_DEV)
@@ -66,8 +70,8 @@ ripped from PLD Linux
+install-qa: default
-include .dep
--- xfsprogs-3.1.2/Makefile
+++ xfsprogs-3.1.2/Makefile
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,8 @@
mkfs: libxfs
quota: libxcmd
@@ -77,26 +81,8 @@ ripped from PLD Linux
ifneq ($(ENABLE_BLKID), yes)
mkfs: libdisk
--- xfsprogs-3.1.2/include/buildmacros
+++ xfsprogs-3.1.2/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
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -71,17 +71,9 @@
# /usr/lib.
ifeq ($(ENABLE_SHARED),yes)