[packages] weechat: Use pkg-config instead of gnutls-config
We don't ship gnutls-config and configure might end up using the hosts gnutls-config. git-svn-id: svn://svn.openwrt.org/openwrt/packages@19690 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
112d67791e
commit
3f4f13d716
@ -79,11 +79,11 @@ CONFIGURE_ARGS+= \
|
||||
--disable-python \
|
||||
--disable-ruby \
|
||||
LUACONFIG="" \
|
||||
ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \
|
||||
|
||||
CONFIGURE_VARS+= \
|
||||
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
|
||||
|
||||
TARGET_LDFLAGS += -lgnutls
|
||||
TARGET_LDFLAGS += \
|
||||
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
|
||||
-Wl,-rpath-link,$(STAGING_DIR)/usr/lib
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),)
|
||||
CONFIGURE_ARGS+= \
|
||||
@ -108,7 +108,7 @@ define Build/Compile
|
||||
all install
|
||||
endef
|
||||
|
||||
define Package/weechat/install
|
||||
define Package/weechat/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(1)/usr/bin/
|
||||
$(INSTALL_DIR) $(1)/usr/lib/weechat/plugins
|
||||
@ -116,7 +116,7 @@ endef
|
||||
|
||||
define BuildPlugin
|
||||
|
||||
define Package/weechat-mod-$(1)/install
|
||||
define Package/weechat-mod-$(1)/install
|
||||
$(INSTALL_DIR) $$(1)/usr/lib/weechat/plugins
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/weechat/plugins/$(1).so* $$(1)/usr/lib/weechat/plugins/
|
||||
endef
|
||||
|
15
net/weechat/patches/010-use-pkg-config.patch
Normal file
15
net/weechat/patches/010-use-pkg-config.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/configure b/configure
|
||||
index f388ffe..c9ec352 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -31400,8 +31400,8 @@ echo "$as_me: WARNING:
|
||||
|
||||
|
||||
if test "x$found_gnutls" = "xyes" ; then
|
||||
- GNUTLS_CFLAGS=`libgnutls-config --cflags`
|
||||
- GNUTLS_LFLAGS=`libgnutls-config --libs`
|
||||
+ GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
|
||||
+ GNUTLS_LFLAGS=`pkg-config gnutls --libs`
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
Loading…
x
Reference in New Issue
Block a user