| 1 |
radhermit 11/02/02 03:30:22 |
| 2 |
|
| 3 |
Added: libebml-1.2.0-makefile-fixup.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libebml/files/libebml-1.2.0-makefile-fixup.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libebml/files/libebml-1.2.0-makefile-fixup.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libebml/files/libebml-1.2.0-makefile-fixup.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libebml-1.2.0-makefile-fixup.patch |
| 16 |
=================================================================== |
| 17 |
--- libebml-1.2.0/make/linux/Makefile.orig |
| 18 |
+++ libebml-1.2.0/make/linux/Makefile |
| 19 |
@@ -50,6 +50,8 @@ |
| 20 |
LIBRARY=libebml.a |
| 21 |
LIBRARY_SO=libebml.so |
| 22 |
LIBRARY_SO_VER=libebml.so.3 |
| 23 |
+LIBRARY_DYLIB=libebml.dylib |
| 24 |
+LIBRARY_DYLIB_VER=libebml.3.dylib |
| 25 |
|
| 26 |
# source-files |
| 27 |
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) |
| 28 |
@@ -62,11 +64,11 @@ |
| 29 |
objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) |
| 30 |
|
| 31 |
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow |
| 32 |
-COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) |
| 33 |
+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) |
| 34 |
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) |
| 35 |
|
| 36 |
ifeq (Darwin,$(shell uname -s)) |
| 37 |
-all: staticlib |
| 38 |
+all: staticlib macholib |
| 39 |
else |
| 40 |
all: staticlib sharedlib |
| 41 |
endif |
| 42 |
@@ -75,8 +77,10 @@ |
| 43 |
|
| 44 |
sharedlib: $(LIBRARY_SO) |
| 45 |
|
| 46 |
+macholib: $(LIBRARY_DYLIB) |
| 47 |
+ |
| 48 |
lib: |
| 49 |
- @echo "Use the 'staticlib', 'sharedlib' or 'all' targets." |
| 50 |
+ @echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets." |
| 51 |
@false |
| 52 |
|
| 53 |
# Build rules |
| 54 |
@@ -91,15 +95,22 @@ |
| 55 |
$(RANLIB) $@ |
| 56 |
|
| 57 |
$(LIBRARY_SO): $(objects_so) |
| 58 |
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) |
| 59 |
+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS) |
| 60 |
rm -f $(LIBRARY_SO) |
| 61 |
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) |
| 62 |
|
| 63 |
+$(LIBRARY_DYLIB): $(objects_so) |
| 64 |
+ $(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS) |
| 65 |
+ rm -f $(LIBRARY_DYLIB) |
| 66 |
+ ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB) |
| 67 |
+ |
| 68 |
clean: |
| 69 |
rm -f $(objects) $(objects_so) |
| 70 |
rm -f $(LIBRARY) |
| 71 |
rm -f $(LIBRARY_SO) |
| 72 |
rm -f $(LIBRARY_SO_VER) |
| 73 |
+ rm -f $(LIBRARY_DYLIB) |
| 74 |
+ rm -f $(LIBRARY_DYLIB_VER) |
| 75 |
rm -f CORE |
| 76 |
|
| 77 |
distclean dist-clean: clean |
| 78 |
@@ -116,30 +127,34 @@ |
| 79 |
done |
| 80 |
|
| 81 |
ifeq (Darwin,$(shell uname -s)) |
| 82 |
-install: install_staticlib install_headers |
| 83 |
+install: install_staticlib install_macholib install_headers |
| 84 |
else |
| 85 |
install: install_staticlib install_sharedlib install_headers |
| 86 |
endif |
| 87 |
|
| 88 |
install_headers: |
| 89 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
| 90 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) |
| 91 |
for i in $(INCLUDE_DIR)/*.h; do \ |
| 92 |
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
| 93 |
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ |
| 94 |
done |
| 95 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c |
| 96 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c |
| 97 |
for i in $(INCLUDE_DIR)/c/*.h; do \ |
| 98 |
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ |
| 99 |
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ |
| 100 |
done |
| 101 |
|
| 102 |
install_staticlib: $(LIBRARY) |
| 103 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) |
| 104 |
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) |
| 105 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) |
| 106 |
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) |
| 107 |
|
| 108 |
install_sharedlib: $(LIBRARY_SO) |
| 109 |
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) |
| 110 |
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) |
| 111 |
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) |
| 112 |
- |
| 113 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) |
| 114 |
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) |
| 115 |
+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) |
| 116 |
+ |
| 117 |
+install_macholib: $(LIBRARY_DYLIB) |
| 118 |
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) |
| 119 |
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir) |
| 120 |
+ ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB) |
| 121 |
|
| 122 |
ifneq ($(wildcard .depend),) |
| 123 |
include .depend |
Archives