mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
25
package/httping/0001-fix-math-library-linking.patch
Normal file
25
package/httping/0001-fix-math-library-linking.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
Move LDFLAGS+=-lm option to the end.
|
||||
The order of the math library directive '-lm' matters.
|
||||
|
||||
Signed-off-by: Yuvaraj Patil <yuvaraj.patil@wipro.com>
|
||||
---
|
||||
diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile
|
||||
--- httping-2.3.4_orig/Makefile 2014-07-23 16:16:36.495546288 +0530
|
||||
+++ httping-2.3.4/Makefile 2014-07-23 16:18:42.547541002 +0530
|
||||
@@ -37,7 +37,6 @@ DEBUG=yes
|
||||
WFLAGS=-Wall -W
|
||||
OFLAGS=
|
||||
CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
|
||||
-LDFLAGS+=-lm
|
||||
|
||||
PACKAGE=$(TARGET)-$(VERSION)
|
||||
PREFIX?=/usr
|
||||
@@ -97,6 +96,8 @@ ifeq ($(ARM),yes)
|
||||
CC=arm-linux-gcc
|
||||
endif
|
||||
|
||||
+LDFLAGS+=-lm
|
||||
+
|
||||
all: $(TARGET) $(TRANSLATIONS)
|
||||
|
||||
$(TARGET): $(OBJS)
|
||||
@@ -0,0 +1,48 @@
|
||||
From fe7d6c5a0e5dfe129f228498037393d23d6ae890 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 18 Jul 2017 19:09:03 +0300
|
||||
Subject: [PATCH] Makefile: allow build without gettext
|
||||
|
||||
The msgfmt command is part of the gettext package, and is used to generate
|
||||
binary translation files. When gettext is not installed, build fails.
|
||||
Translation files are not always needed on size constrained embedded targets.
|
||||
Add an option to disable translation files generation using the NO_GETTEXT
|
||||
variable.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/flok99/httping/pull/36
|
||||
|
||||
Makefile | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 46127f4cdde1..160cc1794ec8 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -55,7 +55,9 @@ MKDIR=/bin/mkdir
|
||||
ARCHIVE=/bin/tar cf -
|
||||
COMPRESS=/bin/gzip -9
|
||||
|
||||
+ifneq ($(NO_GETTEXT),yes)
|
||||
TRANSLATIONS=nl.mo ru.mo
|
||||
+endif
|
||||
|
||||
OBJS=gen.o http.o io.o error.o utils.o main.o tcp.o res.o socks5.o kalman.o cookies.o help.o colors.o
|
||||
|
||||
@@ -118,10 +120,12 @@ install: $(TARGET) $(TRANSLATIONS)
|
||||
ifneq ($(DEBUG),yes)
|
||||
$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
|
||||
endif
|
||||
+ifneq ($(NO_GETTEXT),yes)
|
||||
mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES
|
||||
cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
|
||||
mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES
|
||||
cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo
|
||||
+endif
|
||||
|
||||
|
||||
makefile.inc:
|
||||
--
|
||||
2.13.2
|
||||
|
||||
22
package/httping/Config.in
Normal file
22
package/httping/Config.in
Normal file
@@ -0,0 +1,22 @@
|
||||
comment "httping needs a toolchain w/ wchar"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_HTTPING
|
||||
bool "httping"
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
Httping is like 'ping' but for http-requests.
|
||||
Give it an url, and it'll show you how long it takes to
|
||||
connect, send a request and retrieve the reply (only the
|
||||
headers).
|
||||
Be aware that the transmission across the network also takes
|
||||
time! So it measures the latency of the webserver + network.
|
||||
|
||||
http://www.vanheusden.com/httping/
|
||||
|
||||
if BR2_PACKAGE_HTTPING
|
||||
|
||||
config BR2_PACKAGE_HTTPING_TFO
|
||||
bool "TCP Fast Open (TFO) support"
|
||||
|
||||
endif
|
||||
3
package/httping/httping.hash
Normal file
3
package/httping/httping.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz
|
||||
sha256 c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d license.txt
|
||||
37
package/httping/httping.mk
Normal file
37
package/httping/httping.mk
Normal file
@@ -0,0 +1,37 @@
|
||||
################################################################################
|
||||
#
|
||||
# httping
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HTTPING_VERSION = 2.5
|
||||
HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
|
||||
HTTPING_SITE = http://www.vanheusden.com/httping
|
||||
HTTPING_LICENSE = GPL-2.0
|
||||
HTTPING_LICENSE_FILES = license.txt
|
||||
HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \
|
||||
$(TARGET_NLS_LIBS) \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),-liconv)
|
||||
HTTPING_DEPENDENCIES = \
|
||||
$(TARGET_NLS_DEPENDENCIES) \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
|
||||
$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double)
|
||||
HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
|
||||
FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \
|
||||
NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
|
||||
SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
|
||||
TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
|
||||
NO_GETTEXT=$(if $(BR2_SYSTEM_ENABLE_NLS),no,yes)
|
||||
|
||||
define HTTPING_BUILD_CMDS
|
||||
$(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
|
||||
$(MAKE) DEBUG=no -C $(@D)
|
||||
endef
|
||||
|
||||
define HTTPING_INSTALL_TARGET_CMDS
|
||||
$(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user