summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-08 10:29:50 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-08 10:29:50 +0000
commit493e3f1b5585d22520b27c762519abccfdae3196 (patch)
tree6569cf0045e3b161c87415e581d97b6fc8e2bd64 /dev-libs/libebml/files
parentchange download location because of upstream renaming of package to conform w... (diff)
downloadgentoo-2-493e3f1b5585d22520b27c762519abccfdae3196.tar.gz
gentoo-2-493e3f1b5585d22520b27c762519abccfdae3196.tar.bz2
gentoo-2-493e3f1b5585d22520b27c762519abccfdae3196.zip
multilib fixes in existing versions. Revbump to build shared library.
Diffstat (limited to 'dev-libs/libebml/files')
-rw-r--r--dev-libs/libebml/files/digest-libebml-0.7.1-r11
-rw-r--r--dev-libs/libebml/files/libebml-0.7.1-shared.patch64
2 files changed, 65 insertions, 0 deletions
diff --git a/dev-libs/libebml/files/digest-libebml-0.7.1-r1 b/dev-libs/libebml/files/digest-libebml-0.7.1-r1
new file mode 100644
index 000000000000..a26599a8b7b8
--- /dev/null
+++ b/dev-libs/libebml/files/digest-libebml-0.7.1-r1
@@ -0,0 +1 @@
+MD5 9f777f392d4b50c28151f0bd4e23733e libebml-0.7.1.tar.bz2 50912
diff --git a/dev-libs/libebml/files/libebml-0.7.1-shared.patch b/dev-libs/libebml/files/libebml-0.7.1-shared.patch
new file mode 100644
index 000000000000..881d0792bb44
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-0.7.1-shared.patch
@@ -0,0 +1,64 @@
+diff -Naur libebml-0.7.1.orig/make/linux/Makefile libebml-0.7.1/make/linux/Makefile
+--- libebml-0.7.1.orig/make/linux/Makefile 2004-07-19 09:39:13.000000000 -0700
++++ libebml-0.7.1/make/linux/Makefile 2004-10-08 03:26:40.522886558 -0700
+@@ -49,6 +49,8 @@
+
+ # Names
+ LIBRARY=libebml.a
++LIBRARY_SO=libebml.so
++LIBRARY_SO_VER=libebml.so.0
+
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -61,36 +63,48 @@
+
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
++objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
+
+-all: $(LIBRARY)
++all: $(LIBRARY) $(LIBRARY_SO)
+
+-lib library: $(LIBRARY)
++lib library: $(LIBRARY) $(LIBRARY_SO)
+
+ # Build rules
+ %.o: %$(EXTENSION)
+ $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
++%.lo: %$(EXTENSION)
++ $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++
+ $(LIBRARY): $(objects)
+ $(AR) $@ $(objects)
+ $(RANLIB) $@
+
++$(LIBRARY_SO): $(objects_so)
++ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
++ ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++
+ clean:
+ rm -f $(objects)
+ rm -f $(dependencies)
+ rm -f $(LIBRARY)
++ rm -f $(LIBRARY_SO)
++ rm -f $(LIBRARY_SO_VER)
+ rm -f CORE
+
+ # what are the source dependencies
+ depend: $(sources)
+ $(DEPEND) $(DEPENDFLAGS) $(sources)
+
+-install: $(LIBRARY)
++install: $(LIBRARY) $(LIBRARY_SO)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
++ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
++ ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ for i in $(INCLUDE_DIR)/*.h; do \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \