Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -0,0 +1,32 @@
|
||||
From 043f7a470e32c036f0fe933ec5cd2003087d6b2e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 2 Sep 2017 23:50:42 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: libcgi is in C
|
||||
|
||||
By default, CMake checks that both C and C++ compilers are
|
||||
available. However, since libcgi is only C, there's no need for a C++
|
||||
compiler check. Therefore, this commit adjusts the project() variable
|
||||
definition to only require C language support.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/38
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f98a99d..c599ca9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
#
|
||||
cmake_minimum_required(VERSION 2.8.8)
|
||||
|
||||
-project(cgi)
|
||||
+project(cgi C)
|
||||
string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
|
||||
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LC)
|
||||
set(LIBPREFIX ${PROJECT_NAME})
|
||||
--
|
||||
2.13.5
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
Index: b/src/cgi.c
|
||||
===================================================================
|
||||
--- a/src/cgi.c
|
||||
+++ b/src/cgi.c
|
||||
@@ -336,7 +336,7 @@
|
||||
hextable['b'] = 11;
|
||||
hextable['c'] = 12;
|
||||
hextable['d'] = 13;
|
||||
- hextable['e'] = 13;
|
||||
+ hextable['e'] = 14;
|
||||
hextable['f'] = 15;
|
||||
hextable['A'] = 10;
|
||||
hextable['B'] = 11;
|
||||
Index: b/src/string.c
|
||||
===================================================================
|
||||
--- a/src/string.c
|
||||
+++ b/src/string.c
|
||||
@@ -584,7 +584,7 @@
|
||||
|
||||
va_start(ptr, s);
|
||||
|
||||
- va_copy(bkp, str);
|
||||
+ va_copy(bkp, ptr);
|
||||
len = strlen(s);
|
||||
|
||||
while (*str) {
|
||||
Index: b/Makefile.in
|
||||
===================================================================
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -5,22 +5,32 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
-SHAREDOPT = -shared
|
||||
+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0
|
||||
LIBDIR = $(prefix)/lib
|
||||
-INCDIR = $(prefix)/include
|
||||
+INCDIR = $(prefix)/include/libcgi/
|
||||
MANDIR = $(prefix)/man/man3
|
||||
SHELL = /bin/sh
|
||||
EXTRA_LIBS =
|
||||
|
||||
INCS = -Isrc
|
||||
-FLAGS = -Wall -fpic
|
||||
+FLAGS = -Wall -D_REENTRANT
|
||||
|
||||
OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
|
||||
src/string.o src/general.o src/list.o src/cookie.o
|
||||
+SHOBJS=$(OBJS:.o=.sh.o)
|
||||
|
||||
-.c.o: $(CC) $(FLAGS) -c $<
|
||||
+ALL_TARGETS = src/libcgi.a
|
||||
+ifeq ($(STATIC),)
|
||||
+ALL_TARGETS += src/libcgi.so
|
||||
+endif
|
||||
|
||||
-all: $(OBJS) src/libcgi.so
|
||||
+%.o: %.c
|
||||
+ $(CC) $(FLAGS) -c $*.c -o $@
|
||||
+
|
||||
+%.sh.o: %.c
|
||||
+ $(CC) $(FLAGS) -fPIC -c $*.c -o $@
|
||||
+
|
||||
+all: $(ALL_TARGETS)
|
||||
|
||||
@echo ""
|
||||
@echo ""
|
||||
@@ -48,14 +58,17 @@
|
||||
src/libcgi.a: $(OBJS)
|
||||
$(AR) rc src/libcgi.a $(OBJS)
|
||||
|
||||
-src/libcgi.so: src/libcgi.a
|
||||
- $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
|
||||
+src/libcgi.so: $(SHOBJS)
|
||||
+ $(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS)
|
||||
|
||||
install:
|
||||
- cp src/libcgi.a $(LIBDIR)
|
||||
- cp src/libcgi.so $(LIBDIR)
|
||||
- cp src/cgi.h $(INCDIR)
|
||||
- cp src/session.h $(INCDIR)
|
||||
+ cp src/libcgi.a $(DESTDIR)/$(LIBDIR)
|
||||
+ifeq ($(STATIC),)
|
||||
+ cp src/libcgi.so $(DESTDIR)/$(LIBDIR)
|
||||
+endif
|
||||
+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR)
|
||||
+ cp src/cgi.h $(DESTDIR)/$(INCDIR)
|
||||
+ cp src/session.h $(DESTDIR)/$(INCDIR)
|
||||
|
||||
|
||||
src/error.o: src/error.c src/error.h
|
||||
@@ -69,8 +82,9 @@
|
||||
src/list.o: src/list.c
|
||||
|
||||
clean:
|
||||
- find src/ -name *.*o -exec rm -f {} \;
|
||||
+ find src/ -name *.o -exec rm -f {} \;
|
||||
find src/ -name *.a -exec rm -f {} \;
|
||||
+ find src/ -name *.so -exec rm -f {} \;
|
||||
|
||||
uninstall: clean
|
||||
rm -f $(LIBDIR)/libcgi.*
|
||||
@@ -78,11 +92,11 @@
|
||||
rm -f $(INCDIR)/session.h
|
||||
rm -f $(MANDIR)/libcgi*
|
||||
|
||||
-install_man:
|
||||
- cp doc/man/man3/libcgi_base64.3 $(MANDIR)
|
||||
- cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
|
||||
- cp doc/man/man3/libcgi_general.3 $(MANDIR)
|
||||
- cp doc/man/man3/libcgi_string.3 $(MANDIR)
|
||||
- cp doc/man/man3/libcgi_session.3 $(MANDIR)
|
||||
- cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
|
||||
+#install_man:
|
||||
+# cp doc/man/man3/libcgi_base64.3 $(MANDIR)
|
||||
+# cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
|
||||
+# cp doc/man/man3/libcgi_general.3 $(MANDIR)
|
||||
+# cp doc/man/man3/libcgi_string.3 $(MANDIR)
|
||||
+# cp doc/man/man3/libcgi_session.3 $(MANDIR)
|
||||
+# cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 9bb9d67da0e4faf4bb3a47786dee127e66a49ed0 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 3 Sep 2017 15:22:30 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library
|
||||
|
||||
Building a shared library doesn't work on all platforms, so instead,
|
||||
let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
|
||||
whether a static or shared library should be built.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/39
|
||||
---
|
||||
src/CMakeLists.txt | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index f32d22e..3bde408 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -23,17 +23,18 @@ set(CGI_SRC
|
||||
)
|
||||
|
||||
# create binary
|
||||
-add_library(${PROJECT_NAME}-shared SHARED ${CGI_SRC})
|
||||
-set_target_properties(${PROJECT_NAME}-shared PROPERTIES
|
||||
+add_library(${PROJECT_NAME} ${CGI_SRC})
|
||||
+set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
OUTPUT_NAME ${PROJECT_NAME}
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
VERSION ${PROJECT_VERSION}
|
||||
)
|
||||
|
||||
# install binary
|
||||
-install(TARGETS ${PROJECT_NAME}-shared
|
||||
+install(TARGETS ${PROJECT_NAME}
|
||||
EXPORT ${PROJECT_NAME}-targets
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
)
|
||||
|
||||
# install cmake targets
|
||||
--
|
||||
2.13.5
|
||||
|
||||
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCGI
|
||||
session and cookie support, GET and POST methods manipulation
|
||||
etc..., to help you to quickly write powerful CGI programs.
|
||||
|
||||
http://libcgi.sourceforge.net/
|
||||
https://github.com/rafaelsteil/libcgi/
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 861df39cc0195d43419c4c3de8dff4f42478db66c9ba0b0c1e994c99400e130c libcgi-1.0.tar.gz
|
||||
# From https://github.com/rafaelsteil/libcgi/releases/download/v1.1/libcgi-1.1.tar.gz.sha256sum
|
||||
sha256 128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6 libcgi-1.1.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCGI_VERSION = 1.0
|
||||
LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION)
|
||||
LIBCGI_INSTALL_STAGING = YES
|
||||
# use cross CC/AR rather than host
|
||||
LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
|
||||
$(if $(BR2_STATIC_LIBS),STATIC=1)
|
||||
LIBCGI_LICENSE = LGPLv2.1+
|
||||
LIBCGI_VERSION = 1.1
|
||||
LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION)
|
||||
|
||||
$(eval $(autotools-package))
|
||||
LIBCGI_INSTALL_STAGING = YES
|
||||
LIBCGI_LICENSE = LGPL-2.1+
|
||||
LIBCGI_LICENSE_FILES = COPYING
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user