mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
seafile: import version 5.1.1 and its dependencies
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
This commit is contained in:
Gergely Kiss
committed by
Etienne CHAMPETIER
Etienne CHAMPETIER
parent
39e937fae7
commit
437621931a
+7
-20
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2007-2014 OpenWrt.org
|
||||
# Copyright (C) 2007-2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@@ -8,8 +8,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libsearpc
|
||||
PKG_VERSION:=3.1.7
|
||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||
PKG_VERSION:=5.1.1
|
||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
|
||||
PKG_LICENSE:=GPL-3.0
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
@@ -22,6 +22,7 @@ PKG_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
$(call include_mk, python-package.mk)
|
||||
|
||||
define Package/libsearpc
|
||||
SECTION:=libs
|
||||
@@ -43,21 +44,6 @@ CONFIGURE_ARGS += --enable-compile-demo=no \
|
||||
|
||||
TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -liconv
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
define Host/Configure
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
|
||||
$(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/searpc-codegen.py $(STAGING_DIR)/host/bin/
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/{bin,include}
|
||||
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||
@@ -69,9 +55,10 @@ endef
|
||||
|
||||
define Package/libsearpc/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
|
||||
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsearpc.so* $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/pysearpc $(1)/usr/lib/python2.7/site-packages/
|
||||
$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/pysearpc $(1)$(PYTHON_PKG_DIR)
|
||||
find $(1) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libsearpc))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2007-2014 OpenWrt.org
|
||||
# Copyright (C) 2007-2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@@ -8,13 +8,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libzdb
|
||||
PKG_VERSION:=3.0
|
||||
PKG_VERSION:=3.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=GPL-3.0
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://www.tildeslash.com/libzdb/dist/
|
||||
PKG_MD5SUM:=3bb9efff10a1f3ebc5b76c1055c48635
|
||||
PKG_MD5SUM:=01d8519a596d62f6b43559cc29ecd36d
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_INSTALL:=1
|
||||
@@ -23,10 +23,6 @@ PKG_BUILD_DEPENDS:=libzdb/host
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
ifeq ($(CONFIG_USE_MUSL),n)
|
||||
LDFLAGS += -lnsl
|
||||
endif
|
||||
|
||||
define Package/libzdb
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
@@ -67,8 +63,8 @@ define Host/Compile
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
|
||||
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR)/host/bin/
|
||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
||||
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOST)/bin/
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
|
||||
--- libzdb-3.0.orig/configure.ac 2014-01-06 22:17:57.000000000 +0100
|
||||
+++ libzdb-3.0/configure.ac 2014-11-20 13:59:27.456957651 +0100
|
||||
diff -rupN libzdb-3.1.orig/configure.ac libzdb-3.1/configure.ac
|
||||
--- libzdb-3.1.orig/configure.ac 2015-08-31 14:46:02.000000000 +0200
|
||||
+++ libzdb-3.1/configure.ac 2016-04-18 19:43:13.836937134 +0200
|
||||
@@ -196,15 +196,6 @@ AC_SEARCH_LIBS([pthread_create], [pthrea
|
||||
# Database Libraries
|
||||
|
||||
@@ -40,7 +40,7 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
|
||||
- DBCPPFLAGS="$DBCPPFLAGS `$MYSQLCONFIG --include`"
|
||||
- DBLDFLAGS="$DBLDFLAGS `$MYSQLCONFIG --libs`"
|
||||
+ DBCPPFLAGS="$DBCPPFLAGS -I$STAGING_DIR/usr/include/mysql"
|
||||
+ DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lm $LDFLAGS"
|
||||
+ DBLDFLAGS="$DBLDFLAGS -L$STAGING_DIR/usr/lib/mysql -L$STAGING_DIR/usr/lib -lmysqlclient -lz -lcrypt -lnsl -lm"
|
||||
AC_DEFINE([HAVE_LIBMYSQLCLIENT], 1, [Define to 1 to enable mysql])
|
||||
else
|
||||
CPPFLAGS=$svd_CPPFLAGS
|
||||
@@ -95,18 +95,18 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
|
||||
- [
|
||||
- svd_LDFLAGS=$LDFLAGS
|
||||
- svd_CPPFLAGS=$CPPFLAGS
|
||||
- LDFLAGS="-L$with_sqlite/lib $LDFLAGS -lsqlite3"
|
||||
- LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
|
||||
- CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
|
||||
- AC_SEARCH_LIBS([sqlite3_open], [sqlite3],
|
||||
- [
|
||||
- DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
|
||||
- DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
|
||||
- ],[sqlite="no"])
|
||||
- ],[sqlite="no"],[-ldl])
|
||||
- LDFLAGS=$svd_LDFLAGS
|
||||
- CPPFLAGS=$svd_CPPFLAGS
|
||||
-
|
||||
- ],
|
||||
- AC_SEARCH_LIBS([sqlite3_open], [sqlite3], [], [sqlite="no"]))
|
||||
- AC_SEARCH_LIBS([sqlite3_open], [sqlite3], [], [sqlite="no"], [-ldl]))
|
||||
+ AC_SEARCH_LIBS([sqlite3_open], [sqlite3], [], [sqlite="no"])
|
||||
fi
|
||||
],
|
||||
@@ -157,7 +157,7 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
|
||||
AC_CHECK_FUNCS([timegm])
|
||||
|
||||
|
||||
@@ -487,11 +421,6 @@ echo "| PostgreSQL:
|
||||
@@ -516,11 +450,6 @@ echo "| PostgreSQL:
|
||||
else
|
||||
echo "| PostgreSQL: DISABLED |"
|
||||
fi
|
||||
@@ -169,9 +169,9 @@ diff -rupN libzdb-3.0.orig/configure.ac libzdb-3.0/configure.ac
|
||||
echo "+------------------------------------------------------------+"
|
||||
|
||||
|
||||
diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
|
||||
--- libzdb-3.0.orig/Makefile.am 2014-01-06 22:34:08.000000000 +0100
|
||||
+++ libzdb-3.0/Makefile.am 2014-11-20 13:51:22.508204689 +0100
|
||||
diff -rupN libzdb-3.1.orig/Makefile.am libzdb-3.1/Makefile.am
|
||||
--- libzdb-3.1.orig/Makefile.am 2015-08-31 14:55:18.000000000 +0200
|
||||
+++ libzdb-3.1/Makefile.am 2016-04-18 19:43:42.215769551 +0200
|
||||
@@ -45,11 +45,6 @@ libzdb_la_SOURCES += src/db/sqlite/SQLit
|
||||
src/db/sqlite/SQLiteResultSet.c \
|
||||
src/db/sqlite/SQLitePreparedStatement.c
|
||||
|
||||
@@ -14,7 +14,7 @@ diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
|
||||
RE2C = @RE2C@
|
||||
RE2CFLAGS = -b
|
||||
-FILTERH = ./tools/bin/filterh
|
||||
+FILTERH = $(STAGING_DIR)/host/bin/filterh
|
||||
+FILTERH = $(STAGING_DIR_HOST)/bin/filterh
|
||||
|
||||
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS)
|
||||
AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions
|
||||
|
||||
Reference in New Issue
Block a user