* [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs/files: xfsprogs-3.1.1-sharedlibs.patch
@ 2010-06-03 21:25 Tiziano Mueller (dev-zero)
0 siblings, 0 replies; 4+ messages in thread
From: Tiziano Mueller (dev-zero) @ 2010-06-03 21:25 UTC (permalink / raw
To: gentoo-commits
dev-zero 10/06/03 21:25:56
Added: xfsprogs-3.1.1-sharedlibs.patch
Log:
Version bump (bug #311109), added deps for readline/libedit, added static-libs use flag, changed dependency from e2fsprogs to util-linux, thanks to Hendrik Leppkes for the updated patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.1&content-type=text/plain
Index: xfsprogs-3.1.1-sharedlibs.patch
===================================================================
diff --git a/Makefile b/Makefile
index 83d1b0a..3e4217d 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ io: libxcmd libhandle
mkfs: libxfs
quota: libxcmd
repair: libxfs libxlog
+libxlog: libxfs
ifneq ($(ENABLE_BLKID), yes)
mkfs: libdisk
diff --git a/include/buildmacros b/include/buildmacros
index 62babca..0a3c5ba 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -71,17 +71,9 @@ endif
# /usr/lib.
ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB_DEV = \
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
- fi
+ cd $(TOPDIR)/$(LIBNAME); \
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif
diff --git a/libdisk/Makefile b/libdisk/Makefile
index 32416a5..7a144c0 100644
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -25,8 +25,10 @@ default: ltdepend $(LTLIBRARY)
include $(BUILDRULES)
install: default
+ $(INSTALL_LTLIB)
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: install-dev
diff --git a/libxcmd/Makefile b/libxcmd/Makefile
index 60b6f9e..38e53a6 100644
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -32,6 +32,12 @@ default: ltdepend $(LTLIBRARY)
include $(BUILDRULES)
-install install-dev install-qa: default
+install: default
+ $(INSTALL_LTLIB)
+
+install-dev: default
+ $(INSTALL_LTLIB_DEV)
+
+install-qa: default
-include .dep
diff --git a/libxfs/Makefile b/libxfs/Makefile
index 8f80cdc..fcba668 100644
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -41,8 +41,10 @@ default: ltdepend $(LTLIBRARY)
include $(BUILDRULES)
install: default
+ $(INSTALL_LTLIB)
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: default
diff --git a/libxlog/Makefile b/libxlog/Makefile
index 7358fb1..666ea77 100644
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
@@ -12,6 +12,8 @@ LT_AGE = 0
CFILES = xfs_log_recover.c util.c
+LTLIBS = $(LIBUUID) $(LIBXFS)
+
# don't want to link xfs_repair with a debug libxlog.
DEBUG = -DNDEBUG
@@ -19,6 +21,12 @@ default: ltdepend $(LTLIBRARY)
include $(BUILDRULES)
-install install-dev install-qa: default
+install: default
+ $(INSTALL_LTLIB)
+
+install-dev: default
+ $(INSTALL_LTLIB_DEV)
+
+install-qa: default
-include .dep
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs/files: xfsprogs-3.1.1-sharedlibs.patch
@ 2010-08-17 13:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-17 13:15 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/17 13:15:00
Modified: xfsprogs-3.1.1-sharedlibs.patch
Log:
Clean up library install and prefer readline over editline like upstream #311109.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?r1=1.1&r2=1.2
Index: xfsprogs-3.1.1-sharedlibs.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfsprogs-3.1.1-sharedlibs.patch 3 Jun 2010 21:25:56 -0000 1.1
+++ xfsprogs-3.1.1-sharedlibs.patch 17 Aug 2010 13:14:59 -0000 1.2
@@ -1,45 +1,8 @@
-diff --git a/Makefile b/Makefile
-index 83d1b0a..3e4217d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -66,6 +66,7 @@ io: libxcmd libhandle
- mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-
- ifneq ($(ENABLE_BLKID), yes)
- mkfs: libdisk
-diff --git a/include/buildmacros b/include/buildmacros
-index 62babca..0a3c5ba 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -71,17 +71,9 @@ endif
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
-diff --git a/libdisk/Makefile b/libdisk/Makefile
-index 32416a5..7a144c0 100644
---- a/libdisk/Makefile
-+++ b/libdisk/Makefile
-@@ -25,8 +25,10 @@ default: ltdepend $(LTLIBRARY)
+ripped from PLD Linux
+
+--- xfsprogs-3.1.2/libdisk/Makefile
++++ xfsprogs-3.1.2/libdisk/Makefile
+@@ -25,8 +25,10 @@
include $(BUILDRULES)
install: default
@@ -50,11 +13,9 @@
install-qa: install-dev
-diff --git a/libxcmd/Makefile b/libxcmd/Makefile
-index 60b6f9e..38e53a6 100644
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -32,6 +32,12 @@ default: ltdepend $(LTLIBRARY)
+--- xfsprogs-3.1.2/libxcmd/Makefile
++++ xfsprogs-3.1.2/libxcmd/Makefile
+@@ -32,6 +32,12 @@
include $(BUILDRULES)
@@ -68,26 +29,21 @@
+install-qa: default
-include .dep
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 8f80cdc..fcba668 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -41,8 +41,10 @@ default: ltdepend $(LTLIBRARY)
+--- xfsprogs-3.1.2/libxfs/Makefile
++++ xfsprogs-3.1.2/libxfs/Makefile
+@@ -41,7 +41,9 @@
include $(BUILDRULES)
install: default
-+ $(INSTALL_LTLIB)
++ $(INSTALL_LTLIB_ROOT)
install-dev: default
+ $(INSTALL_LTLIB_DEV)
install-qa: default
-
-diff --git a/libxlog/Makefile b/libxlog/Makefile
-index 7358fb1..666ea77 100644
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
+--- xfsprogs-3.1.2/libxlog/Makefile
++++ xfsprogs-3.1.2/libxlog/Makefile
+@@ -12,6 +12,8 @@
CFILES = xfs_log_recover.c util.c
@@ -96,13 +52,13 @@
# don't want to link xfs_repair with a debug libxlog.
DEBUG = -DNDEBUG
-@@ -19,6 +21,12 @@ default: ltdepend $(LTLIBRARY)
+@@ -19,6 +21,12 @@
include $(BUILDRULES)
-install install-dev install-qa: default
+install: default
-+ $(INSTALL_LTLIB)
++ $(INSTALL_LTLIB_ROOT)
+
+install-dev: default
+ $(INSTALL_LTLIB_DEV)
@@ -110,3 +66,54 @@
+install-qa: default
-include .dep
+--- xfsprogs-3.1.2/Makefile
++++ xfsprogs-3.1.2/Makefile
+@@ -66,6 +66,7 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
+
+ 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 = \
+ cd $(TOPDIR)/$(LIBNAME)/.libs; \
+- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+- ../$(INSTALL) -m 644 -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 644 -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 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+- cd $(TOPDIR)/$(LIBNAME)/.libs; \
+- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+- fi
++ cd $(TOPDIR)/$(LIBNAME); \
++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs/files: xfsprogs-3.1.1-sharedlibs.patch
@ 2010-08-18 0:31 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-18 0:31 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/18 00:31:51
Modified: xfsprogs-3.1.1-sharedlibs.patch
Log:
run lib install commands with set -e
Revision Changes Path
1.3 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?r1=1.2&r2=1.3
Index: xfsprogs-3.1.1-sharedlibs.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfsprogs-3.1.1-sharedlibs.patch 17 Aug 2010 13:14:59 -0000 1.2
+++ xfsprogs-3.1.1-sharedlibs.patch 18 Aug 2010 00:31:51 -0000 1.3
@@ -83,7 +83,7 @@
ifeq ($(ENABLE_SHARED),yes)
-INSTALL_LTLIB = \
-+_INSTALL_LTLIB = \
++_INSTALL_LTLIB = set -e; \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
@@ -111,7 +111,7 @@
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
- fi
-+ cd $(TOPDIR)/$(LIBNAME); \
++ set -e; cd $(TOPDIR)/$(LIBNAME); \
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
else
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs/files: xfsprogs-3.1.1-sharedlibs.patch
@ 2012-10-19 4:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2012-10-19 4:19 UTC (permalink / raw
To: gentoo-commits
vapier 12/10/19 04:19:17
Modified: xfsprogs-3.1.1-sharedlibs.patch
Log:
Fix parallel install failures with libxlog #438764 by Jorge Manuel B. S. Vicetto.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?r1=1.3&r2=1.4
Index: xfsprogs-3.1.1-sharedlibs.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfsprogs-3.1.1-sharedlibs.patch 18 Aug 2010 00:31:51 -0000 1.3
+++ xfsprogs-3.1.1-sharedlibs.patch 19 Oct 2012 04:19:17 -0000 1.4
@@ -68,11 +68,12 @@
-include .dep
--- xfsprogs-3.1.2/Makefile
+++ xfsprogs-3.1.2/Makefile
-@@ -66,6 +66,7 @@
+@@ -66,6 +66,8 @@
mkfs: libxfs
quota: libxcmd
repair: libxfs libxlog
+libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
ifneq ($(ENABLE_BLKID), yes)
mkfs: libdisk
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-19 4:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-19 4:19 [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs/files: xfsprogs-3.1.1-sharedlibs.patch Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2010-08-18 0:31 Mike Frysinger (vapier)
2010-08-17 13:15 Mike Frysinger (vapier)
2010-06-03 21:25 Tiziano Mueller (dev-zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox