diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2007-12-03 00:00:46 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2007-12-03 00:00:46 +0000 |
commit | 7c2b96328682f9bce2cf856cddfc46cacc77c28f (patch) | |
tree | bac38312c793cd65436d893fc2230db540c9e246 /sys-cluster/pvfs2/files | |
parent | push changes (diff) | |
download | gentoo-2-7c2b96328682f9bce2cf856cddfc46cacc77c28f.tar.gz gentoo-2-7c2b96328682f9bce2cf856cddfc46cacc77c28f.tar.bz2 gentoo-2-7c2b96328682f9bce2cf856cddfc46cacc77c28f.zip |
Added latest upstream release to address shared library and API issues
(Portage version: 2.1.4_rc1)
Diffstat (limited to 'sys-cluster/pvfs2/files')
-rw-r--r-- | sys-cluster/pvfs2/files/2.7.0-lib-install.patch | 21 | ||||
-rw-r--r-- | sys-cluster/pvfs2/files/2.7.0-soname.patch | 60 | ||||
-rw-r--r-- | sys-cluster/pvfs2/files/digest-pvfs2-2.7.0 | 3 |
3 files changed, 84 insertions, 0 deletions
diff --git a/sys-cluster/pvfs2/files/2.7.0-lib-install.patch b/sys-cluster/pvfs2/files/2.7.0-lib-install.patch new file mode 100644 index 000000000000..34803d0cf262 --- /dev/null +++ b/sys-cluster/pvfs2/files/2.7.0-lib-install.patch @@ -0,0 +1,21 @@ +--- Makefile.in.orig 2007-11-30 16:49:56.000000000 -0800 ++++ Makefile.in 2007-11-30 16:53:49.000000000 -0800 +@@ -55,6 +55,7 @@ + prefix = $(DESTDIR)@prefix@ + datarootdir = $(DESTDIR)@datarootdir@ + mandir = $(DESTDIR)@mandir@ ++libdir = $(DESTDIR)@libdir@ + exec_prefix = $(DESTDIR)@exec_prefix@ + + VPATH = $(srcdir) +@@ -893,8 +894,8 @@ + install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include + install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include + +- install -d $(prefix)/lib +- install -m 755 $(LIBRARIES) $(prefix)/lib ++ install -d $(libdir) ++ install -m 755 $(LIBRARIES) $(libdir) + + ifdef TARGET_OS_DARWIN + # TOC needs to be regenerated in libs after they get moved diff --git a/sys-cluster/pvfs2/files/2.7.0-soname.patch b/sys-cluster/pvfs2/files/2.7.0-soname.patch new file mode 100644 index 000000000000..8b994182d435 --- /dev/null +++ b/sys-cluster/pvfs2/files/2.7.0-soname.patch @@ -0,0 +1,60 @@ +--- Makefile.in.orig 2007-12-02 12:26:02.000000000 -0800 ++++ Makefile.in 2007-12-02 12:47:58.000000000 -0800 +@@ -64,6 +64,7 @@ + # TODO: should probably check for bison and flex in configure + BISON = bison + FLEX = flex ++LN = ln -s + BUILD_BMI_TCP = @BUILD_BMI_TCP@ + BUILD_GM = @BUILD_GM@ + BUILD_MX = @BUILD_MX@ +@@ -163,6 +164,8 @@ + REDHAT_RELEASE = @REDHAT_RELEASE@ + NPTL_WORKAROUND = @NPTL_WORKAROUND@ + STRICT_CFLAGS = @STRICT_CFLAGS@ ++SO_LIBS = -lcrypt -lssl -lpthread ++SO_VER = 2.0 + # for Solaris: + # LIBS += -lsocket -lnsl + +@@ -436,8 +439,10 @@ + LIBRARIES := + LIBRARIES_THREADED := + ifeq ($(build_shared),yes) +-LIBRARIES_SHARED = lib/libpvfs2.so ++LIBRARIES_SHARED = lib/libpvfs2.so.$(SO_VER) + LIBRARIES += $(LIBRARIES_SHARED) ++LIBRARIES_THREADED_SHARED = lib/libpvfs2-threaded.so.$(SO_VER) ++LIBRARIES_THREADED += $(LIBRARIES_THREADED_SHARED) + endif + ifeq ($(build_static),yes) + LIBRARIES_STATIC = lib/libpvfs2.a +@@ -628,16 +633,16 @@ + $(E)ar rcs $@ $(LIBTHREADEDOBJS) + + # rule for building the pvfs2 library +-lib/libpvfs2.so: $(LIBPICOBJS) ++lib/libpvfs2.so.$(SO_VER): $(LIBPICOBJS) + $(Q) " LDSO $@" + $(E)$(INSTALL) -d lib +- $(E)$(LDSHARED) -o $@ $(LIBPICOBJS) ++ $(E)$(LDSHARED) -Wl,-soname,libpvfs2.so.$(SO_VER) -o $@ $(LIBPICOBJS) $(SO_LIBS) + + # rule for building the pvfs2 _multithreaded_ library +-lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS) ++lib/libpvfs2-threaded.so.$(SO_VER): $(LIBTHREADEDPICOBJS) + $(Q) " LDSO $@" + $(E)$(INSTALL) -d lib +- $(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS) ++ $(E)$(LDSHARED) -Wl,-soname,libpvfs2-threaded.so.$(SO_VER) -o $@ $(LIBTHREADEDPICOBJS) $(SO_LIBS) + + # rule for building the pvfs2 server library + lib/libpvfs2-server.a: $(SERVEROBJS) +@@ -896,6 +901,7 @@ + + install -d $(libdir) + install -m 755 $(LIBRARIES) $(libdir) ++ install -m 755 $(LIBRARIES_THREADED) $(libdir) + + ifdef TARGET_OS_DARWIN + # TOC needs to be regenerated in libs after they get moved diff --git a/sys-cluster/pvfs2/files/digest-pvfs2-2.7.0 b/sys-cluster/pvfs2/files/digest-pvfs2-2.7.0 new file mode 100644 index 000000000000..8a8cdfa5bf22 --- /dev/null +++ b/sys-cluster/pvfs2/files/digest-pvfs2-2.7.0 @@ -0,0 +1,3 @@ +MD5 99e7680e82b692f699b5a295b31989c8 pvfs-2.7.0.tar.gz 2249993 +RMD160 bc694aaf83029ea6cde4b2c64225f63203e2b862 pvfs-2.7.0.tar.gz 2249993 +SHA256 5c781ba3943b7fa604617ba08a8da7651ac4b82fdc910b01ae7cfd6f32e87f85 pvfs-2.7.0.tar.gz 2249993 |