| 1 |
blueness 14/07/29 15:52:40 |
| 2 |
|
| 3 |
Added: leveldb-1.9.0-memenv-so.patch |
| 4 |
Log: |
| 5 |
Add patch for libmemenv.a with PIC, bug #505320 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: leveldb-1.9.0-memenv-so.patch |
| 16 |
=================================================================== |
| 17 |
--- leveldb-1.9.0.orig/Makefile 2013-01-07 21:07:29.000000000 +0000 |
| 18 |
+++ leveldb-1.9.0/Makefile 2014-03-28 22:11:05.000000000 +0000 |
| 19 |
@@ -61,37 +61,45 @@ |
| 20 |
# Should we build shared libraries? |
| 21 |
ifneq ($(PLATFORM_SHARED_EXT),) |
| 22 |
|
| 23 |
+SHARED1 = $(PLATFORM_SHARED_EXT) |
| 24 |
+ |
| 25 |
ifneq ($(PLATFORM_SHARED_VERSIONED),true) |
| 26 |
-SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) |
| 27 |
SHARED2 = $(SHARED1) |
| 28 |
SHARED3 = $(SHARED1) |
| 29 |
-SHARED = $(SHARED1) |
| 30 |
+SHARED=%.$(SHARED1) |
| 31 |
else |
| 32 |
# Update db.h if you change these. |
| 33 |
SHARED_MAJOR = 1 |
| 34 |
SHARED_MINOR = 9 |
| 35 |
-SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) |
| 36 |
SHARED2 = $(SHARED1).$(SHARED_MAJOR) |
| 37 |
SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) |
| 38 |
-SHARED = $(SHARED1) $(SHARED2) $(SHARED3) |
| 39 |
-$(SHARED1): $(SHARED3) |
| 40 |
- ln -fs $(SHARED3) $(SHARED1) |
| 41 |
-$(SHARED2): $(SHARED3) |
| 42 |
- ln -fs $(SHARED3) $(SHARED2) |
| 43 |
+SHARED=%.$(SHARED1) %.$(SHARED2) %.$(SHARED3) |
| 44 |
+%.$(SHARED1): %.$(SHARED3) |
| 45 |
+ ln -fs $< $@ |
| 46 |
+%.$(SHARED2): %.$(SHARED3) |
| 47 |
+ ln -fs $< $@ |
| 48 |
endif |
| 49 |
|
| 50 |
-$(SHARED3): |
| 51 |
- $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS) |
| 52 |
+%.SHARED: $(SHARED) |
| 53 |
+ @true |
| 54 |
+ |
| 55 |
+%.$(SHARED3): |
| 56 |
+ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$*.$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $^ -o $@ $(LIBS) |
| 57 |
+ |
| 58 |
+libleveldb.$(SHARED3): $(SOURCES) |
| 59 |
+libmemenv.$(SHARED3): $(MEMENV_SOURCES) |
| 60 |
+ |
| 61 |
+.SECONDARY: $(subst %,libleveldb,$(SHARED)) $(subst %,libmemenv,$(SHARED)) |
| 62 |
|
| 63 |
endif # PLATFORM_SHARED_EXT |
| 64 |
|
| 65 |
-all: $(SHARED) $(LIBRARY) |
| 66 |
+all: libleveldb.SHARED $(LIBRARY) |
| 67 |
|
| 68 |
check: all $(PROGRAMS) $(TESTS) |
| 69 |
for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done |
| 70 |
|
| 71 |
clean: |
| 72 |
- -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk |
| 73 |
+ -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(subst %,libleveldb,$(SHARED)) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk |
| 74 |
-rm -rf ios-x86/* ios-arm/* |
| 75 |
|
| 76 |
$(LIBRARY): $(LIBOBJECTS) |
Archives