subversion: add unixodbc dependency
Compile tested: LEDE HEAD
If unixodbc package is present in the environment, subversion
fails to compile due to missing dependencies.
Fixes the dependency on unixodbc if unixodbc package is selected.
Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
(cherry picked from commit 06a529df35
)
This commit is contained in:
parent
5c6e36f117
commit
51e67dae00
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=subversion
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=1.9.5
|
||||
PKG_SOURCE_URL:=@APACHE/subversion
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
|
@ -29,7 +29,7 @@ define Package/subversion/Default
|
|||
CATEGORY:=Network
|
||||
SUBMENU:=Version Control Systems
|
||||
TITLE:=A compelling replacement for CVS
|
||||
DEPENDS:=+zlib +libsqlite3 +libapr +libaprutil +libmagic \
|
||||
DEPENDS:=+zlib +libsqlite3 +PACKAGE_unixodbc:unixodbc +libapr +libaprutil +libmagic \
|
||||
$(ICONV_DEPENDS) $(INTL_DEPENDS)
|
||||
URL:=http://subversion.apache.org/
|
||||
endef
|
||||
|
@ -80,6 +80,7 @@ endef
|
|||
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
||||
APU_LIBS=$(shell $(STAGING_DIR)/usr/bin/apu-1-config --link-libtool --libs)
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
|
||||
|
@ -101,7 +102,7 @@ else
|
|||
endif
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) $(APU_LIBS) -lcrypt -lm \
|
||||
-lz -lpthread $(if $(INTL_FULL),-lintl)"
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS)"
|
||||
|
||||
|
|
Loading…
Reference in New Issue