Permalink
Browse files

bip:

 * remove unnecessary overrides
 * revise patches


git-svn-id: file:///var/svn/freetz/trunk@11496 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent d19c817 commit 705678859957c5db5b95fb3bebd51ff5bd6f6ffc er13 committed Dec 29, 2013
Showing with 13 additions and 5 deletions.
  1. +1 −4 make/bip/bip.mk
  2. +11 −0 make/bip/patches/010-libdl.patch
  3. +1 −1 make/bip/patches/110-no_libintl.patch
View
@@ -9,7 +9,6 @@ $(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/bip
ifeq ($(strip $(FREETZ_PACKAGE_BIP_WITH_SSL)),y)
$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
$(PKG)_DEPENDS_ON := openssl
-$(PKG)_LIBS := -lssl -lcrypto -ldl
endif
ifeq ($(strip $(FREETZ_PACKAGE_BIP_STATIC)),y)
@@ -30,9 +29,7 @@ $(PKG_CONFIGURED_CONFIGURE)
$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
$(SUBMAKE) -C $(BIP_DIR) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(BIP_LDFLAGS)" \
- LIBS="$(BIP_LIBS)"
+ LDFLAGS="$(BIP_LDFLAGS)"
$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY)
$(INSTALL_BINARY_STRIP)
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -5914,7 +5914,7 @@
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+
+- LIBS="-lcrypto $LIBS"
++ LIBS="-lcrypto -ldl $LIBS"
+
+ else
+
@@ -5,7 +5,7 @@
fi
-for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h
-+for ac_header in arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h
++for ac_header in arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

0 comments on commit 7056788

Please sign in to comment.