[csw-devel] SF.net SVN: gar:[10319] csw/mgar/pkg/liblockfile/trunk
andrewrn at users.sourceforge.net
andrewrn at users.sourceforge.net
Fri Jun 25 11:57:27 CEST 2010
Revision: 10319
http://gar.svn.sourceforge.net/gar/?rev=10319&view=rev
Author: andrewrn
Date: 2010-06-25 09:57:26 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
liblockfile: Modifications to get the shared libraries to build correctly
Modified Paths:
--------------
csw/mgar/pkg/liblockfile/trunk/Makefile
csw/mgar/pkg/liblockfile/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch
csw/mgar/pkg/liblockfile/trunk/files/0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch
csw/mgar/pkg/liblockfile/trunk/files/0005-Don-t-try-and-use-ldconfig.patch
Removed Paths:
-------------
csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch
Modified: csw/mgar/pkg/liblockfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/Makefile 2010-06-25 08:40:54 UTC (rev 10318)
+++ csw/mgar/pkg/liblockfile/trunk/Makefile 2010-06-25 09:57:26 UTC (rev 10319)
@@ -20,11 +20,11 @@
LICENSE = COPYRIGHT
# Patches for Makefile.in
-PATCHFILES = 0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 0002-Modify-Makefile.in-to-create-directories-first.patch 0003-Stop-ginstall-setting-ownership.patch
+PATCHFILES = 0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 0002-Modify-Makefile.in-to-create-directories-first.patch 0003-Stop-ginstall-setting-ownership.patch 0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch 0005-Don-t-try-and-use-ldconfig.patch
# Need to specify the installation prefix as the configuration script
# doesn't handle different operating systems very well
-CONFIGURE_ARGS = $(DIRPATHS) --prefix=opt/csw
+CONFIGURE_ARGS = $(DIRPATHS) --prefix=opt/csw --enable-shared
# liblockfile doesn't provide any tests so skip these
SKIPTEST=1
Modified: csw/mgar/pkg/liblockfile/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/checksums 2010-06-25 08:40:54 UTC (rev 10318)
+++ csw/mgar/pkg/liblockfile/trunk/checksums 2010-06-25 09:57:26 UTC (rev 10319)
@@ -1,4 +1,6 @@
-3b5017e3e326a65ae05c41cedca79fac 0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
-cf6672a7c23066ea1a591dfd6b023ad3 0002-Modify-Makefile.in-to-create-directories-first.patch
-4838df3eadab17ef0a547384a47b9a4b 0003-Stop-ginstall-setting-ownership.patch
+e6d78df74c5e9a65e9df18628e610647 0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
+fa86673a2755afed0c1f46b5ba2523f7 0002-Modify-Makefile.in-to-create-directories-first.patch
+957831a9f8f32bdab40fcbf396d2f2b3 0003-Stop-ginstall-setting-ownership.patch
+3c439108a65d7f83ace5b431e29087ab 0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch
+6f1540d5a19ae2c65396cdba9b6c292e 0005-Don-t-try-and-use-ldconfig.patch
c24e2dfb4a2aab0263fe5ac1564d305e liblockfile_1.08.orig.tar.gz
Deleted: csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 2010-06-25 08:40:54 UTC (rev 10318)
+++ csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -1,51 +0,0 @@
-From ba46675875a1d81f9fa4755fd012f81e0d4f9068 Mon Sep 17 00:00:00 2001
-From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
-Date: Wed, 23 Jun 2010 10:38:14 +0200
-Subject: [PATCH 1/3] Modify Makefile to use ginstall instead of install
-
----
- Makefile.in | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7ae5406..2424969 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -50,26 +50,26 @@ xlockfile.o: lockfile.c
- $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
-
- install_static: static install_common
-- install -m 644 liblockfile.a $(ROOT)$(libdir)
-+ ginstall -m 644 liblockfile.a $(ROOT)$(libdir)
-
- install_shared: shared install_common
-- install -m 755 liblockfile.so \
-+ ginstall -m 755 liblockfile.so \
- $(ROOT)$(libdir)/liblockfile.so.$(VER)
- ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-
- install_common:
-- install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
-+ ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
- if [ "$(MAILGROUP)" != "" ]; then\
-- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
-+ ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
- else \
-- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
-+ ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
- fi
-- install -m 644 *.1 $(ROOT)$(mandir)/man1
-- install -m 644 *.3 $(ROOT)$(mandir)/man3
-+ ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
-+ ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
-
- install_nfslib: nfslib
-- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
-+ ginstall -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-
- clean:
---
-1.7.1
-
Added: csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0001-Modify-Makefile-to-use-ginstall-instead-of-install.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -0,0 +1,51 @@
+From e5126dad4292649c33fc0cb0405cc9add2af8f73 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 10:38:14 +0200
+Subject: [PATCH 1/4] Modify Makefile to use ginstall instead of install
+
+---
+ Makefile.in | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7ae5406..2424969 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,26 +50,26 @@ xlockfile.o: lockfile.c
+ $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+
+ install_static: static install_common
+- install -m 644 liblockfile.a $(ROOT)$(libdir)
++ ginstall -m 644 liblockfile.a $(ROOT)$(libdir)
+
+ install_shared: shared install_common
+- install -m 755 liblockfile.so \
++ ginstall -m 755 liblockfile.so \
+ $(ROOT)$(libdir)/liblockfile.so.$(VER)
+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+ if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
+ install_common:
+- install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
++ ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ if [ "$(MAILGROUP)" != "" ]; then\
+- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
++ ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+ else \
+- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
++ ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+ fi
+- install -m 644 *.1 $(ROOT)$(mandir)/man1
+- install -m 644 *.3 $(ROOT)$(mandir)/man3
++ ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
++ ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
+
+ install_nfslib: nfslib
+- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
++ ginstall -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+ if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
+ clean:
+--
+1.7.1
+
Deleted: csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch 2010-06-25 08:40:54 UTC (rev 10318)
+++ csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -1,24 +0,0 @@
-From 17724440df75bb232a274e852d5731cbffd5ed04 Mon Sep 17 00:00:00 2001
-From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
-Date: Wed, 23 Jun 2010 11:01:36 +0200
-Subject: [PATCH 2/3] Modify Makefile.in to create directories first
-
----
- Makefile.in | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2424969..af0028c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -59,6 +59,7 @@ install_shared: shared install_common
- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-
- install_common:
-+ ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
- ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
- if [ "$(MAILGROUP)" != "" ]; then\
- ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
---
-1.7.1
-
Added: csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0002-Modify-Makefile.in-to-create-directories-first.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -0,0 +1,24 @@
+From bba82f9e0d0bb3ace56570b9574a0b1e88431a14 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 11:01:36 +0200
+Subject: [PATCH 2/4] Modify Makefile.in to create directories first
+
+---
+ Makefile.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2424969..af0028c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -59,6 +59,7 @@ install_shared: shared install_common
+ if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
+ install_common:
++ ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
+ ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ if [ "$(MAILGROUP)" != "" ]; then\
+ ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+--
+1.7.1
+
Deleted: csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch 2010-06-25 08:40:54 UTC (rev 10318)
+++ csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -1,31 +0,0 @@
-From f853374c16cbdcff6be49361de782a5af6854dfc Mon Sep 17 00:00:00 2001
-From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
-Date: Wed, 23 Jun 2010 11:06:33 +0200
-Subject: [PATCH 3/3] Stop ginstall setting ownership.
-
-Solaris package creation takes care of changing ownership to root anyway.
-Without this, this fails on sparc only (bad fakeroot?)
----
- Makefile.in | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index af0028c..040a426 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,11 +61,7 @@ install_shared: shared install_common
- install_common:
- ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
- ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
-- if [ "$(MAILGROUP)" != "" ]; then\
-- ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
-- else \
-- ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
-- fi
-+ ginstall -m 755 dotlockfile $(ROOT)$(bindir); \
- ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
- ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
-
---
-1.7.1
-
Added: csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0003-Stop-ginstall-setting-ownership.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -0,0 +1,31 @@
+From ae84ed479df518fe78d5023267b31ef4148d5f72 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Wed, 23 Jun 2010 11:06:33 +0200
+Subject: [PATCH 3/4] Stop ginstall setting ownership.
+
+Solaris package creation takes care of changing ownership to root anyway.
+Without this, this fails on sparc only (bad fakeroot?)
+---
+ Makefile.in | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index af0028c..040a426 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,11 +61,7 @@ install_shared: shared install_common
+ install_common:
+ ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
+ ginstall -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+- if [ "$(MAILGROUP)" != "" ]; then\
+- ginstall -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+- else \
+- ginstall -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+- fi
++ ginstall -m 755 dotlockfile $(ROOT)$(bindir); \
+ ginstall -m 644 *.1 $(ROOT)$(mandir)/man1
+ ginstall -m 644 *.3 $(ROOT)$(mandir)/man3
+
+--
+1.7.1
+
Added: csw/mgar/pkg/liblockfile/trunk/files/0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0004-Use-h-option-instead-of-soname-to-the-linker-for-pre.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -0,0 +1,35 @@
+From cbaca0b660e9c7dfa2dbff7c0e41f2e6e862db80 Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Fri, 25 Jun 2010 11:07:31 +0200
+Subject: [PATCH 4/4] Use -h option instead of -soname to the linker for preparing the shared libs
+
+The gcc version of ld aliases -soname to -h and the upstream authors are
+using -soname. The Sun version of ld however, only supports -h.
+
+This patch changes the option passed to the linker such that it can be
+built with SunStudio.
+---
+ Makefile.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 040a426..c4368be 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o
+ ar rv liblockfile.a lockfile.o
+
+ liblockfile.so: liblockfile.a
+- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
++ $(CC) -fPIC -shared -Wl,-h,liblockfile.so.1 \
+ -o liblockfile.so lockfile.o -lc
+
+ nfslock.so.$(VER): nfslock.o
+- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
++ $(CC) -fPIC -shared -Wl,-h,nfslock.so.0 \
+ -o nfslock.so.$(NVER) nfslock.o
+
+ dotlockfile: dotlockfile.o xlockfile.o
+--
+1.7.1
+
Added: csw/mgar/pkg/liblockfile/trunk/files/0005-Don-t-try-and-use-ldconfig.patch
===================================================================
--- csw/mgar/pkg/liblockfile/trunk/files/0005-Don-t-try-and-use-ldconfig.patch (rev 0)
+++ csw/mgar/pkg/liblockfile/trunk/files/0005-Don-t-try-and-use-ldconfig.patch 2010-06-25 09:57:26 UTC (rev 10319)
@@ -0,0 +1,32 @@
+From 59f0e5beecc45d131b2b4f0da83d97dc9eea2b8c Mon Sep 17 00:00:00 2001
+From: Andrew Robert Nicols <andrew.nicols at luns.net.uk>
+Date: Fri, 25 Jun 2010 11:48:16 +0200
+Subject: [PATCH] Don't try and use ldconfig
+
+---
+ Makefile.in | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c4368be..4cb13ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -56,7 +56,6 @@ install_shared: shared install_common
+ ginstall -m 755 liblockfile.so \
+ $(ROOT)$(libdir)/liblockfile.so.$(VER)
+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
+ install_common:
+ ginstall -d $(ROOT)/$(bindir) $(ROOT)/$(libdir) $(ROOT)/$(mandir)/man1 $(ROOT)/$(mandir)/man3 $(ROOT)/$(nfslockdir) $(ROOT)/$(includedir)
+@@ -67,7 +66,6 @@ install_common:
+
+ install_nfslib: nfslib
+ ginstall -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
+ clean:
+ rm -f *.a *.o *.so *.so.* dotlockfile
+--
+1.7.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list