jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-26 04:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

leveldb: fix staging and target installation

Browse Source 
The patch adding target/staging installation support needs variable names
update to account for upstream changes in version 1.19.

Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Baruch Siach 2016-09-08 15:26:17 +03:00 committed by Thomas Petazzoni
parent e14ae6f9e4
commit b43f50320d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/leveldb/0002-Add-install-recipe.patch
View File

@ -1,21 +1,23 @@
From 818d59f093100d5f39db34d5686a9d983172d307 Mon Sep 17 00:00:00 2001 From bf646b73391d3d2d0b9780a399dd24880c66b9ab Mon Sep 17 00:00:00 2001
From: Steve James <ste@junkomatic.net> From: Steve James <ste@junkomatic.net>
Date: Sun, 5 Apr 2015 16:30:46 +0200 Date: Sun, 5 Apr 2015 16:30:46 +0200
Subject: [PATCH 2/2] Add install recipe Subject: [PATCH 2/2] Add install recipe
Upstream-Status: Submitted [https://github.com/google/leveldb/pull/276] Upstream-Status: Rejected [https://github.com/google/leveldb/pull/276]
Signed-off-by: Steve James <ste@junkomatic.net> Signed-off-by: Steve James <ste@junkomatic.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[baruch: update for v1.19]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
--- ---
Makefile | 16 ++++++++++++++++ Makefile | 14 ++++++++++++++
1 file changed, 16 insertions(+) 1 file changed, 14 insertions(+)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 2bd2cad..530f2c3 100644 index 07a5a1ead6fd..c87023db527a 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -412,3 +412,19 @@ else @@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc
$(SHARED_OUTDIR)/%.o: %.c $(SHARED_OUTDIR)/%.o: %.c
$(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
@ -23,18 +25,16 @@ index 2bd2cad..530f2c3 100644
+INSTALL_ROOT = / +INSTALL_ROOT = /
+INSTALL_PREFIX= usr/local +INSTALL_PREFIX= usr/local
+ +
+install: $(SHARED) $(LIBRARY) +install: all
+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb + install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb
+ install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb + install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb
+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib + install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
+ ifneq (,$(LIBRARY)) + install -m 0644 $(STATIC_OUTDIR)/libleveldb.a $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
+ install -m 0644 $(LIBRARY) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib +ifneq (,$(SHARED_LIBS))
+ endif + install -m 0755 $(SHARED_OUTDIR)/$(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
+ ifneq (,$(SHARED)) + ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB1)
+ install -m 0755 $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib + ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB2)
+ ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED1) +endif
+ ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED2)
+ endif
-- --
2.1.0 2.1.0