From 9820fd672904673c35b1e4edbb62aa7b9cc1f339 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:03:34 -0700 Subject: [PATCH 01/20] fbzmq: remove Signed-off-by: Rosen Penev --- libs/fbzmq/Makefile | 48 --------------------------- libs/fbzmq/patches/010-fbthrift.patch | 13 -------- 2 files changed, 61 deletions(-) delete mode 100644 libs/fbzmq/Makefile delete mode 100644 libs/fbzmq/patches/010-fbthrift.patch diff --git a/libs/fbzmq/Makefile b/libs/fbzmq/Makefile deleted file mode 100644 index a7c2818b0d..0000000000 --- a/libs/fbzmq/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=fbzmq -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbzmq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=41b6c671dd1cd16eeffa94f146c8a6841c8a05e0517d8affc96dde8324af11af - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/fbzmq - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Facebook ZeroMQ wrappers. - URL:=https://github.com/facebook/fbzmq - DEPENDS:=+libfolly +libzmq +libsigar +fbthrift -endef - -define Package/fbzmq/description - Facebook ZeroMQ wrappers. -endef - -CMAKE_OPTIONS += \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTS=OFF \ - -DFBTHRIFT_COMPILER="$(STAGING_DIR_HOSTPKG)/bin/thrift1" - -TARGET_CXXFLAGS += -faligned-new -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/fbzmq/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfbzmq.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fbzmq)) diff --git a/libs/fbzmq/patches/010-fbthrift.patch b/libs/fbzmq/patches/010-fbthrift.patch deleted file mode 100644 index 29c75a38d8..0000000000 --- a/libs/fbzmq/patches/010-fbthrift.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,6 +34,10 @@ find_package(Threads REQUIRED) - find_package(Boost 1.67.0 MODULE - COMPONENTS - context -+ filesystem -+ program_options -+ regex -+ system - REQUIRED - ) - From 6ba8c9131bf6356e78c3e0853e8fe343671947d7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:03:57 -0700 Subject: [PATCH 02/20] fbthrift: remove Signed-off-by: Rosen Penev --- libs/fbthrift/Makefile | 62 ------------------- .../patches/010-no-boost-thread.patch | 10 --- libs/fbthrift/patches/020-compiler.patch | 11 ---- 3 files changed, 83 deletions(-) delete mode 100644 libs/fbthrift/Makefile delete mode 100644 libs/fbthrift/patches/010-no-boost-thread.patch delete mode 100644 libs/fbthrift/patches/020-compiler.patch diff --git a/libs/fbthrift/Makefile b/libs/fbthrift/Makefile deleted file mode 100644 index 3ea2999f32..0000000000 --- a/libs/fbthrift/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=fbthrift -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbthrift/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=91403f96a8dc49bc25791fe2836587e644d3e96c55b08e7dfe8bb0075c45a472 - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -HOST_BUILD_DEPENDS:=boost/host -PKG_BUILD_DEPENDS:=fbthrift/host - -HOST_BUILD_PARALLEL:=1 -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/fbthrift - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Facebook's branch of Apache Thrift, including a new C++ server. - URL:=https://github.com/facebook/fbthrift - DEPENDS:=+libfmt +libwangle +librsocket-cpp -endef - -define Package/fbthrift/description - Facebook's branch of Apache Thrift, including a new C++ server. -endef - -CMAKE_HOST_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -Dcompiler_only=ON - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCXX_STD=c++14 \ - -Dlib_only=ON \ - -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/" \ - -Dpython-six_DIR=OFF - -TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/fbthrift/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fbthrift)) -$(eval $(call HostBuild)) diff --git a/libs/fbthrift/patches/010-no-boost-thread.patch b/libs/fbthrift/patches/010-no-boost-thread.patch deleted file mode 100644 index cf7a4dd09b..0000000000 --- a/libs/fbthrift/patches/010-no-boost-thread.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,6 @@ find_package( - program_options - regex - system -- thread - ) - include_directories(${Boost_INCLUDE_DIRS}) - diff --git a/libs/fbthrift/patches/020-compiler.patch b/libs/fbthrift/patches/020-compiler.patch deleted file mode 100644 index b1182dddb0..0000000000 --- a/libs/fbthrift/patches/020-compiler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/thrift/cmake/FBThriftConfig.cmake.in -+++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -20,7 +20,7 @@ set_and_check(FBTHRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - if (WIN32) - set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1.exe") - else() -- set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") -+# set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") - endif() - - if (NOT TARGET FBThrift::thriftcpp2) From c018f46411c0794526e2be2c0e11fed7ab28877a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:04:33 -0700 Subject: [PATCH 03/20] libwangle: remove Signed-off-by: Rosen Penev --- libs/libwangle/Makefile | 42 ------------------- libs/libwangle/patches/010-c++14.patch | 11 ----- .../patches/020-no-boost-thread.patch | 11 ----- 3 files changed, 64 deletions(-) delete mode 100644 libs/libwangle/Makefile delete mode 100644 libs/libwangle/patches/010-c++14.patch delete mode 100644 libs/libwangle/patches/020-no-boost-thread.patch diff --git a/libs/libwangle/Makefile b/libs/libwangle/Makefile deleted file mode 100644 index 06338dc5ab..0000000000 --- a/libs/libwangle/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=libwangle -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebook/wangle/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b030fbff5f346ba4e50e97fc452b321f1f32b215ba7a31e1538c2996b76cf1e9 -PKG_BUILD_DIR:=$(BUILD_DIR)/wangle-$(PKG_VERSION) - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 -CMAKE_SOURCE_SUBDIR:=wangle -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libwangle - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Wangle: C++ networking library - URL:=https://github.com/facebook/wangle - DEPENDS:=+libfizz -endef - -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON - -define Package/libwangle/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwangle.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libwangle)) diff --git a/libs/libwangle/patches/010-c++14.patch b/libs/libwangle/patches/010-c++14.patch deleted file mode 100644 index 46b1281197..0000000000 --- a/libs/libwangle/patches/010-c++14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/wangle/CMakeLists.txt -+++ b/wangle/CMakeLists.txt -@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.0.2) - - project("wangle" VERSION 1.0.0 LANGUAGES CXX C) - --add_compile_options(-std=c++1z) -+add_compile_options(-std=c++14) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" diff --git a/libs/libwangle/patches/020-no-boost-thread.patch b/libs/libwangle/patches/020-no-boost-thread.patch deleted file mode 100644 index 375e57a73f..0000000000 --- a/libs/libwangle/patches/020-no-boost-thread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/wangle/CMakeLists.txt -+++ b/wangle/CMakeLists.txt -@@ -56,7 +56,7 @@ if (NOT folly_FOUND) - endif() - - find_package(fizz CONFIG REQUIRED) --find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context -+find_package(Boost REQUIRED COMPONENTS system filesystem regex context - program_options) - find_package(OpenSSL REQUIRED) - find_package(Glog REQUIRED) From dc11235ece963903fff49352b24d612aa28c6241 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:04:46 -0700 Subject: [PATCH 04/20] librsocket-cpp: remove Signed-off-by: Rosen Penev --- libs/librsocket-cpp/Makefile | 69 ------------------- .../patches/101-do-not-use-gold.patch | 10 --- libs/librsocket-cpp/patches/102-gcc9.patch | 11 --- .../patches/103-no-boost-thread.patch | 11 --- 4 files changed, 101 deletions(-) delete mode 100644 libs/librsocket-cpp/Makefile delete mode 100644 libs/librsocket-cpp/patches/101-do-not-use-gold.patch delete mode 100644 libs/librsocket-cpp/patches/102-gcc9.patch delete mode 100644 libs/librsocket-cpp/patches/103-no-boost-thread.patch diff --git a/libs/librsocket-cpp/Makefile b/libs/librsocket-cpp/Makefile deleted file mode 100644 index 45459978f5..0000000000 --- a/libs/librsocket-cpp/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=librsocket-cpp -PKG_SOURCE_DATE:=2019-10-07 -PKG_SOURCE_VERSION:=0a469f7a84d9e3c3ddcb6931df701a5dae536589 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/rsocket/rsocket-cpp/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=c10e498039d676946a11f6a45201575cdb3f1f582752693d7b1901aa434f3146 -PKG_BUILD_DIR:=$(BUILD_DIR)/rsocket-cpp-$(PKG_SOURCE_VERSION) - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 -CMAKE_BINARY_SUBDIR:=builddir -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/librsocket-cpp - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C++ implementation of RSocket - URL:=https://rsocket.io/ - DEPENDS:=+libyarpl -endef - -define Package/libyarpl - SECTION:=libs - CATEGORY:=Libraries - TITLE:=yarpl: Yet Another Reactive Programming Library - URL:=https://rsocket.io/ - DEPENDS:=+libfolly -endef - -define Package/librsocket-cpp/description - C++ implementation of RSocket, and Application protocol providing Reactive Streams semantics -endef - -define Package/libyarpl/description - C++ implementation of reactive functional programming including both Observable and Flowable types. -endef - -CMAKE_OPTIONS += \ - -DBUILD_BENCHMARKS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/librsocket-cpp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libReactiveSocket.so* $(1)/usr/lib/ -endef - -define Package/libyarpl/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyarpl*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,librsocket-cpp)) -$(eval $(call BuildPackage,libyarpl)) diff --git a/libs/librsocket-cpp/patches/101-do-not-use-gold.patch b/libs/librsocket-cpp/patches/101-do-not-use-gold.patch deleted file mode 100644 index a65154e586..0000000000 --- a/libs/librsocket-cpp/patches/101-do-not-use-gold.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,7 +67,6 @@ - if (RSOCKET_ASAN) - set(ASAN_FLAGS -fsanitize=address,undefined) - endif () -- set(EXTRA_LINK_FLAGS ${EXTRA_LINK_FLAGS} -fuse-ld=gold) - - elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang) - if (RSOCKET_ASAN) diff --git a/libs/librsocket-cpp/patches/102-gcc9.patch b/libs/librsocket-cpp/patches/102-gcc9.patch deleted file mode 100644 index 1a5910a4bd..0000000000 --- a/libs/librsocket-cpp/patches/102-gcc9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/yarpl/Refcounted.h -+++ b/yarpl/Refcounted.h -@@ -42,7 +42,7 @@ std::shared_ptr atomic_exchange( - auto refptr = ar->ref.lock(); - auto old = std::move(*refptr); - *refptr = std::move(r); -- return std::move(old); -+ return old; - } - - template diff --git a/libs/librsocket-cpp/patches/103-no-boost-thread.patch b/libs/librsocket-cpp/patches/103-no-boost-thread.patch deleted file mode 100644 index 60a3f34e92..0000000000 --- a/libs/librsocket-cpp/patches/103-no-boost-thread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -195,7 +195,7 @@ find_package(Gflags REQUIRED) - find_package(Glog REQUIRED) - - # find boost::* to satisfy the folly dep --find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context -+find_package(Boost REQUIRED COMPONENTS system filesystem regex context - program_options) - - include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) From bbec1eb5e90fb034f5b7e4cac26dc6835a8fafcf Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:05:40 -0700 Subject: [PATCH 05/20] libsigar: remove Signed-off-by: Rosen Penev --- libs/libsigar/Makefile | 39 ----------------------- libs/libsigar/patches/010-rindex.patch | 18 ----------- libs/libsigar/patches/020-sysmacros.patch | 10 ------ 3 files changed, 67 deletions(-) delete mode 100644 libs/libsigar/Makefile delete mode 100644 libs/libsigar/patches/010-rindex.patch delete mode 100644 libs/libsigar/patches/020-sysmacros.patch diff --git a/libs/libsigar/Makefile b/libs/libsigar/Makefile deleted file mode 100644 index 39f22138e8..0000000000 --- a/libs/libsigar/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=libsigar -PKG_SOURCE_DATE:=2017-02-21 -PKG_SOURCE_VERSION:=a6c61edf8c64e013411e8c9d753165cd03102c6e -PKG_RELEASE:=3 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/boundary/sigar -PKG_MIRROR_HASH:=5f017e10ab1d929c9dfb2937fef16a45962b60958cd1569573d18f00fcea290f - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILE:=LICENSE - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -define Package/libsigar - SECTION:=libs - CATEGORY:=Libraries - TITLE:=System Information Gatherer And Reporter - URL:=https://github.com/boundary/sigar - DEPENDS:=+libtirpc -endef - -define Package/libsigar/description - System Information Gatherer And Reporter -endef - -define Package/libsigar/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigar.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libsigar)) diff --git a/libs/libsigar/patches/010-rindex.patch b/libs/libsigar/patches/010-rindex.patch deleted file mode 100644 index bc0b064a3e..0000000000 --- a/libs/libsigar/patches/010-rindex.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/sigar_util.c -+++ b/src/sigar_util.c -@@ -954,14 +954,10 @@ int sigar_file2str(const char *fname, char *buffer, int buflen) - #define vsnprintf _vsnprintf - #endif - --#ifdef WIN32 --# define rindex strrchr --#endif -- - static int proc_module_get_self(void *data, char *name, int len) - { - sigar_t *sigar = (sigar_t *)data; -- char *ptr = rindex(name, '/'); -+ char *ptr = strrchr(name, '/'); - - if (!ptr) { - return SIGAR_OK; diff --git a/libs/libsigar/patches/020-sysmacros.patch b/libs/libsigar/patches/020-sysmacros.patch deleted file mode 100644 index 334a908a31..0000000000 --- a/libs/libsigar/patches/020-sysmacros.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/os/linux/linux_sigar.c -+++ b/src/os/linux/linux_sigar.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include From 5911707366a6ebcee16785f2b58745e22f9ccd85 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:06:43 -0700 Subject: [PATCH 06/20] libgflags: remove Signed-off-by: Rosen Penev --- libs/libgflags/Makefile | 46 ----------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 libs/libgflags/Makefile diff --git a/libs/libgflags/Makefile b/libs/libgflags/Makefile deleted file mode 100644 index 28bd559b78..0000000000 --- a/libs/libgflags/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=gflags -PKG_VERSION:=2.2.2 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/gflags/gflags/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=COPYING.txt - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -PKG_BUILD_PARALLEL:=1 -HOST_BUILD_PARALLEL:=1 -CMAKE_OPTIONS:= \ - -DGFLAGS_BUILD_SHARED_LIBS=ON \ - -DGFLAGS_BUILD_STATIC_LIBS=ON -CMAKE_INSTALL:=1 - -define Package/gflags - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C++ library that implements commandline flags processing - DEPENDS:=+libstdcpp +libpthread - URL:=https://github.com/gflags/gflags -endef - -define Package/gflags/description - The gflags package contains a C++ library that implements commandline flags - processing. It includes built-in support for standard types such as string and - the ability to define flags in the source file in which they are used. -endef - -define Package/gflags/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgflags.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,gflags)) -$(eval $(call HostBuild)) From 1f1d4db6945236b5b499f654b9bf5aa2b6cec953 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:07:04 -0700 Subject: [PATCH 07/20] libfizz: remove Signed-off-by: Rosen Penev --- libs/libfizz/Makefile | 49 ------------------- .../libfizz/patches/010-no-boost-thread.patch | 11 ----- 2 files changed, 60 deletions(-) delete mode 100644 libs/libfizz/Makefile delete mode 100644 libs/libfizz/patches/010-no-boost-thread.patch diff --git a/libs/libfizz/Makefile b/libs/libfizz/Makefile deleted file mode 100644 index 2b62e3c2fa..0000000000 --- a/libs/libfizz/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=libfizz -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebookincubator/fizz/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=acf0184466b518dd58d02dc04211aac1c4504bb3ff6d9e8454af5ac2bc85fa6c -PKG_BUILD_DIR:=$(BUILD_DIR)/fizz-$(PKG_VERSION) - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_CPE_ID:=cpe:/a:facebook:fizz - -PKG_BUILD_PARALLEL:=1 -CMAKE_SOURCE_SUBDIR:=fizz -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libfizz - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libfolly - TITLE:=C++14 implementation of the TLS-1.3 standard - URL:=https://github.com/facebookincubator/fizz -endef - -define Package/libfizz/description - C++14 implementation of the TLS-1.3 standard. - Fizz currently supports TLS 1.3 drafts 28, 26 (both wire-compatible with the final specification), and 23. -endef - -CMAKE_OPTIONS += \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_SHARED_LIBS=ON - -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/libfizz/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfizz.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libfizz)) diff --git a/libs/libfizz/patches/010-no-boost-thread.patch b/libs/libfizz/patches/010-no-boost-thread.patch deleted file mode 100644 index 3a503d0fab..0000000000 --- a/libs/libfizz/patches/010-no-boost-thread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -52,7 +52,7 @@ if (NOT folly_FOUND) - find_package(Folly MODULE REQUIRED) - endif() - --find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context -+find_package(Boost REQUIRED COMPONENTS system filesystem regex context - program_options) - find_package(OpenSSL REQUIRED) - find_package(Glog REQUIRED) From 54b54275363af21fa85aef097ecd94934e60cc69 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:07:20 -0700 Subject: [PATCH 08/20] libfolly: remove Signed-off-by: Rosen Penev --- libs/libfolly/Makefile | 60 ------------------- .../100-cmake-fix-regex-match-path.patch | 38 ------------ .../patches/101-remove-undefined-dcheck.patch | 10 ---- .../patches/102-no-boost-thread.patch | 12 ---- libs/libfolly/patches/103-arm-yield.patch | 11 ---- 5 files changed, 131 deletions(-) delete mode 100644 libs/libfolly/Makefile delete mode 100644 libs/libfolly/patches/100-cmake-fix-regex-match-path.patch delete mode 100644 libs/libfolly/patches/101-remove-undefined-dcheck.patch delete mode 100644 libs/libfolly/patches/102-no-boost-thread.patch delete mode 100644 libs/libfolly/patches/103-arm-yield.patch diff --git a/libs/libfolly/Makefile b/libs/libfolly/Makefile deleted file mode 100644 index 3722fa453c..0000000000 --- a/libs/libfolly/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=libfolly -PKG_VERSION:=2019.10.07.00 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/facebook/folly/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3c8ab22e551ff73509aa008454d5e15da9a05b64bc20450459c3da2471729fff -PKG_BUILD_DIR:=$(BUILD_DIR)/folly-$(PKG_VERSION) - -PKG_MAINTAINER:=Amol Bhave -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libfolly - SECTION:=libs - CATEGORY:=Libraries - TITLE:=An open-source C++ library developed and used at Facebook. - URL:=https://github.com/facebook/folly - DEPENDS:=+boost +boost-context +boost-filesystem +boost-program_options +boost-regex \ - +libopenssl +libdouble-conversion +libevent2 +glog +libsodium +libaio +libatomic \ - +libbz2 +zlib +libzstd +liblzma +liblz4 +PACKAGE_libunwind:libunwind -endef - -define Package/libfolly/description - An open-source C++ library developed and used at Facebook. - Folly (acronymed loosely after Facebook Open Source Library) is a library of - C++14 components designed with practicality and efficiency in mind. - Folly contains a variety of core library components used extensively at Facebook. - This package includes the shared library. -endef - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DFOLLY_HAVE_UNALIGNED_ACCESS_EXITCODE=OFF \ - -DFOLLY_HAVE_UNALIGNED_ACCESS_EXITCODE__TRYRUN_OUTPUT=OFF \ - -DFOLLY_HAVE_LINUX_VDSO_EXITCODE=OFF \ - -DFOLLY_HAVE_LINUX_VDSO_EXITCODE__TRYRUN_OUTPUT=OFF \ - -DFOLLY_HAVE_WCHAR_SUPPORT_EXITCODE=OFF \ - -DFOLLY_HAVE_WCHAR_SUPPORT_EXITCODE__TRYRUN_OUTPUT=OFF \ - -DHAVE_VSNPRINTF_ERRORS_EXITCODE=OFF \ - -DHAVE_VSNPRINTF_ERRORS_EXITCODE__TRYRUN_OUTPUT=OFF - -TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Package/libfolly/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfolly*.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libfolly)) diff --git a/libs/libfolly/patches/100-cmake-fix-regex-match-path.patch b/libs/libfolly/patches/100-cmake-fix-regex-match-path.patch deleted file mode 100644 index 985b93443b..0000000000 --- a/libs/libfolly/patches/100-cmake-fix-regex-match-path.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,17 +112,19 @@ configure_file( - auto_sources(files "*.cpp" "RECURSE" "${FOLLY_DIR}") - auto_sources(hfiles "*.h" "RECURSE" "${FOLLY_DIR}") - -+string(REPLACE + \\+ FOLLY_DIR_ESCAPED ${FOLLY_DIR}) -+ - # Exclude tests, benchmarks, and other standalone utility executables from the - # library sources. Test sources are listed separately below. - REMOVE_MATCHES_FROM_LISTS(files hfiles - MATCHES -- "^${FOLLY_DIR}/build/" -- "^${FOLLY_DIR}/experimental/exception_tracer/" -- "^${FOLLY_DIR}/experimental/pushmi/" -- "^${FOLLY_DIR}/futures/exercises/" -- "^${FOLLY_DIR}/logging/example/" -- "^${FOLLY_DIR}/(.*/)?test/" -- "^${FOLLY_DIR}/tools/" -+ "^${FOLLY_DIR_ESCAPED}/build/" -+ "^${FOLLY_DIR_ESCAPED}/experimental/exception_tracer/" -+ "^${FOLLY_DIR_ESCAPED}/experimental/pushmi/" -+ "^${FOLLY_DIR_ESCAPED}/futures/exercises/" -+ "^${FOLLY_DIR_ESCAPED}/logging/example/" -+ "^${FOLLY_DIR_ESCAPED}/(.*/)?test/" -+ "^${FOLLY_DIR_ESCAPED}/tools/" - "Benchmark.cpp$" - "Test.cpp$" - ) -@@ -175,7 +177,7 @@ list(APPEND hfiles - if (NOT FOLLY_USE_SYMBOLIZER) - REMOVE_MATCHES_FROM_LISTS(files hfiles - MATCHES -- "^${FOLLY_DIR}/experimental/symbolizer/" -+ "^${FOLLY_DIR_ESCAPED}/experimental/symbolizer/" - ) - list(REMOVE_ITEM files - ${FOLLY_DIR}/SingletonStackTrace.cpp diff --git a/libs/libfolly/patches/101-remove-undefined-dcheck.patch b/libs/libfolly/patches/101-remove-undefined-dcheck.patch deleted file mode 100644 index 470745bfe0..0000000000 --- a/libs/libfolly/patches/101-remove-undefined-dcheck.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/folly/stats/detail/BufferedStat-inl.h -+++ b/folly/stats/detail/BufferedStat-inl.h -@@ -69,7 +69,6 @@ void BufferedStat::doUpdate( - TimePoint now, - const std::unique_lock& g, - UpdateMode updateMode) { -- DCHECK(g.owns_lock()); - // Check that no other thread has performed the slide after the check - auto oldExpiry = expiry_.load(std::memory_order_relaxed).tp; - if (now > oldExpiry || updateMode == UpdateMode::Now) { diff --git a/libs/libfolly/patches/102-no-boost-thread.patch b/libs/libfolly/patches/102-no-boost-thread.patch deleted file mode 100644 index eb15afa7cf..0000000000 --- a/libs/libfolly/patches/102-no-boost-thread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake -index 0c212057..a4c06695 100644 ---- a/CMake/folly-deps.cmake -+++ b/CMake/folly-deps.cmake -@@ -12,7 +12,6 @@ find_package(Boost 1.51.0 MODULE - program_options - regex - system -- thread - REQUIRED - ) - list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES}) diff --git a/libs/libfolly/patches/103-arm-yield.patch b/libs/libfolly/patches/103-arm-yield.patch deleted file mode 100644 index f8695261fe..0000000000 --- a/libs/libfolly/patches/103-arm-yield.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/folly/portability/Asm.h -+++ b/folly/portability/Asm.h -@@ -38,7 +38,7 @@ inline void asm_volatile_pause() { - ::_mm_pause(); - #elif defined(__i386__) || FOLLY_X64 - asm volatile("pause"); --#elif FOLLY_AARCH64 || defined(__arm__) -+#elif FOLLY_AARCH64 || (defined(__arm__) && !(__ARM_ARCH < 7)) - asm volatile("yield"); - #elif FOLLY_PPC64 - asm volatile("or 27,27,27"); From bb196a7727e0a048d45662871fceedca67ec8fd6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:28:55 -0700 Subject: [PATCH 09/20] avro: remove Signed-off-by: Rosen Penev --- libs/avro/Makefile | 66 -------------------------- libs/avro/patches/010-pkgconfig.patch | 30 ------------ libs/avro/patches/020-bin-shared.patch | 27 ----------- libs/avro/patches/030-ssize_t.patch | 11 ----- 4 files changed, 134 deletions(-) delete mode 100644 libs/avro/Makefile delete mode 100644 libs/avro/patches/010-pkgconfig.patch delete mode 100644 libs/avro/patches/020-bin-shared.patch delete mode 100644 libs/avro/patches/030-ssize_t.patch diff --git a/libs/avro/Makefile b/libs/avro/Makefile deleted file mode 100644 index ebd842dd78..0000000000 --- a/libs/avro/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# avro - Makefile for Apache Avro library -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=avro-c -PKG_VERSION:=1.9.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@APACHE/avro/avro-$(PKG_VERSION)/c -PKG_HASH:=7df7bc1e13ce7180f0438ed05ab6642b5b2b6df91f30b927b470e25a78e04642 - -PKG_MAINTAINER:=John Clark -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/avro-c - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+jansson +zlib +liblzma - TITLE:=Apache Avro C Library - URL:=https://avro.apache.org -endef - -define Package/avro-c/description - This package contains the Apache Avro C library. -endef - -define Package/avro-c-utils - SECTIONS:=utils - CATEGORY:=Utilities - DEPENDS:=+avro-c - TITLE:=Apache Avro C utilities - URL:=https://avro.apache.org -endef - -define Package/avro-c-utils/description - This package contains the Apache Avro C utilities. -endef - -TARGET_LDFLAGS += -Wl,--gc-sections - -define Package/avro-c/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavro.so* $(1)/usr/lib/ -endef - -define Package/avro-c-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/avro* $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,avro-c)) -$(eval $(call BuildPackage,avro-c-utils)) - diff --git a/libs/avro/patches/010-pkgconfig.patch b/libs/avro/patches/010-pkgconfig.patch deleted file mode 100644 index 2c95912ecf..0000000000 --- a/libs/avro/patches/010-pkgconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -122,9 +122,8 @@ endif(WIN32) - - # Install pkg-config file - --set(prefix ${CMAKE_INSTALL_PREFIX}) - set(VERSION ${AVRO_VERSION}) --configure_file(avro-c.pc.in avro-c.pc) -+configure_file(avro-c.pc.in avro-c.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc - DESTINATION lib/pkgconfig) - ---- a/src/avro-c.pc.in -+++ b/src/avro-c.pc.in -@@ -1,7 +1,12 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ - Name: avro-c - Description: C library for parsing Avro data - Version: @VERSION@ - URL: https://avro.apache.org/ --Libs: -L@prefix@/lib -lavro --Cflags: -I@prefix@/include -+Libs: -L${libdir} -lavro -+Cflags: -I${includedir} - Requires: @CODEC_PKG@ diff --git a/libs/avro/patches/020-bin-shared.patch b/libs/avro/patches/020-bin-shared.patch deleted file mode 100644 index 61419373d2..0000000000 --- a/libs/avro/patches/020-bin-shared.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -129,20 +129,20 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc - DESTINATION lib/pkgconfig) - - add_executable(avrocat avrocat.c) --target_link_libraries(avrocat avro-static) -+target_link_libraries(avrocat avro-shared) - install(TARGETS avrocat RUNTIME DESTINATION bin) - - add_executable(avroappend avroappend.c) --target_link_libraries(avroappend avro-static) -+target_link_libraries(avroappend avro-shared) - install(TARGETS avroappend RUNTIME DESTINATION bin) - - if (NOT WIN32) - #TODO: Port getopt() to Windows to compile avropipe.c and avromod.c - add_executable(avropipe avropipe.c) --target_link_libraries(avropipe avro-static) -+target_link_libraries(avropipe avro-shared) - install(TARGETS avropipe RUNTIME DESTINATION bin) - - add_executable(avromod avromod.c) --target_link_libraries(avromod avro-static) -+target_link_libraries(avromod avro-shared) - install(TARGETS avromod RUNTIME DESTINATION bin) - endif(NOT WIN32) diff --git a/libs/avro/patches/030-ssize_t.patch b/libs/avro/patches/030-ssize_t.patch deleted file mode 100644 index 746c7a5d86..0000000000 --- a/libs/avro/patches/030-ssize_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/avro_generic_internal.h -+++ b/src/avro_generic_internal.h -@@ -28,6 +28,8 @@ extern "C" { - #include "avro/schema.h" - #include "avro/value.h" - -+#include -+ - /* - * Each generic value implementation struct defines a couple of extra - * methods that we use to control the lifecycle of the value objects. From 7b02849f5111d940c10e4b6ef7ee0d7b6ba45eb3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:31:24 -0700 Subject: [PATCH 10/20] rxtx: remove This does not build as GCC no longer includes Java support. Signed-off-by: Rosen Penev --- libs/rxtx/Makefile | 49 ------------------------- libs/rxtx/patches/010-acm-devices.patch | 11 ------ 2 files changed, 60 deletions(-) delete mode 100644 libs/rxtx/Makefile delete mode 100755 libs/rxtx/patches/010-acm-devices.patch diff --git a/libs/rxtx/Makefile b/libs/rxtx/Makefile deleted file mode 100644 index 3ead137644..0000000000 --- a/libs/rxtx/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (C) 2016 Dana H. Myers -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rxtx -PKG_VERSION:=2.2pre2 -PKG_RELEASE:=1 -PKG_LICENSE:=LGPL-2.1 -PKG_MAINTAINER:=Dana H. Myers - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=http://rxtx.qbang.org/pub/rxtx/ -PKG_HASH:=3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 - -PKG_FIXUP:=patch-libtool -PKG_CHECK_FORMAT_SECURITY:=0 - -include $(INCLUDE_DIR)/package.mk - -define Package/rxtx - SECTION:=libs - CATEGORY:=Libraries - TITLE:=RX/TX Support for Java serial communications - URL:=http://rxtx.qbang.org/wiki/index.php/Main_Page - DEPENDS:=+libpthread +classpath -endef - -define Package/rxtx/description - RX/TX Support for Java serial communications -endef - -CONFIGURE_ARGS += \ - --disable-PRINTER - -define Package/rxtx/install - $(INSTALL_DIR) \ - $(1)/usr/lib/classpath - $(CP) $(PKG_BUILD_DIR)/$(GNU_TARGET_NAME)-gnu/.libs/*.so \ - $(1)/usr/lib/classpath/ - $(CP) $(PKG_BUILD_DIR)/RXTXcomm.jar \ - $(1)/usr/lib/classpath/ -endef - -$(eval $(call BuildPackage,rxtx)) diff --git a/libs/rxtx/patches/010-acm-devices.patch b/libs/rxtx/patches/010-acm-devices.patch deleted file mode 100755 index 3833c5cc5c..0000000000 --- a/libs/rxtx/patches/010-acm-devices.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java rxtx-2.2pre2.new/src/gnu/io/RXTXCommDriver.java ---- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java 2008-11-13 16:44:01.000000000 -0800 -+++ rxtx-2.2pre2.new/src/gnu/io/RXTXCommDriver.java 2015-08-21 16:19:14.330743949 -0700 -@@ -579,6 +579,7 @@ public class RXTXCommDriver implements C - "ttyUSB", // for USB frobs - "rfcomm", // bluetooth serial device - "ttyircomm", // linux IrCommdevices (IrDA serial emu) -+ "ttyACM" // linux CDC ACM devices - }; - CandidatePortPrefixes=Temp; - } From 27f871473d38e2ab9ce987c4fcdeb69947b8a0c0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:31:59 -0700 Subject: [PATCH 11/20] classpath: remove This no longer builds as GCC no longer includes Java support. Signed-off-by: Rosen Penev --- libs/classpath/Makefile | 95 ------------------- .../patches/010-double-memleak.patch | 91 ------------------ .../020-fix-statement-may-fall-through.patch | 10 -- 3 files changed, 196 deletions(-) delete mode 100644 libs/classpath/Makefile delete mode 100644 libs/classpath/patches/010-double-memleak.patch delete mode 100644 libs/classpath/patches/020-fix-statement-may-fall-through.patch diff --git a/libs/classpath/Makefile b/libs/classpath/Makefile deleted file mode 100644 index f9d58b3fde..0000000000 --- a/libs/classpath/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=classpath -PKG_VERSION:=0.99 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/classpath -PKG_HASH:=f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 - -PKG_MAINTAINER:=Dana H. Myers -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=COPYING -PKG_CPE_ID:=cpe:/a:gnu:classpath - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=jamvm/host - -include $(INCLUDE_DIR)/package.mk - -define Package/classpath - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GNU Classpath - URL:=https://www.gnu.org/software/classpath/ - DEPENDS:=+alsa-lib +libgmp +libmagic -endef - -define Package/classpath/Description - GNU Classpath, Essential Libraries for Java, is a GNU project - to create free core class libraries for use with virtual - machines and compilers for the java programming language. -endef - -define Package/classpath-tools - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GNU Classpath tools - URL:=https://www.gnu.org/software/classpath/ -endef - -define Download/antlr - URL:=https://www.antlr.org/download - FILE:=antlr-3.4-complete.jar - HASH:=9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 -endef -$(eval $(call Download,antlr)) - -EXTRA_CFLAGS += -Wno-error=implicit-fallthrough -CONFIGURE_ARGS += \ - --with-gmp="$(STAGING_DIR)/usr" \ - --without-x \ - --disable-gtk-peer \ - --disable-qt-peer \ - --disable-dssi \ - --disable-plugin \ - --disable-gconf-peer \ - --disable-gjdoc \ - --disable-examples \ - --with-antlr-jar=$(DL_DIR)/antlr-3.4-complete.jar - -define Package/classpath/install - $(INSTALL_DIR) \ - $(1)/usr/lib/classpath \ - $(1)/usr/share/classpath - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/security \ - $(PKG_INSTALL_DIR)/usr/lib/logging.properties \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/*.so* $(1)/usr/lib/classpath/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/share/classpath/ -endef - -define Package/classpath-tools/install - $(INSTALL_DIR) \ - $(1)/usr/bin \ - $(1)/usr/share/classpath - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/tools.zip $(1)/usr/share/classpath/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef - -$(eval $(call BuildPackage,classpath)) -$(eval $(call BuildPackage,classpath-tools)) diff --git a/libs/classpath/patches/010-double-memleak.patch b/libs/classpath/patches/010-double-memleak.patch deleted file mode 100644 index 02ec5ad8d7..0000000000 --- a/libs/classpath/patches/010-double-memleak.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- classpath-0.99.orig/native/fdlibm/dtoa.c 2007-09-27 05:33:38.000000000 -0700 -+++ classpath-0.99/native/fdlibm/dtoa.c 2014-12-21 14:22:42.451713851 -0800 -@@ -883,6 +883,16 @@ ret1: - return s0; - } - -+void free_Bigints(struct _Jv_Bigint *p) -+{ -+ struct _Jv_Bigint *l = p; -+ while (l) -+ { -+ struct _Jv_Bigint *next = l->_next; -+ free (l); -+ l = next; -+ } -+} - - _VOID - _DEFUN (_dtoa, -@@ -905,16 +915,15 @@ _DEFUN (_dtoa, - p = _dtoa_r (&reent, _d, mode, ndigits, decpt, sign, rve, float_type); - strcpy (buf, p); - -- for (i = 0; i < reent._result_k; ++i) -+ for (i = 0; i < reent._max_k; ++i) - { -- struct _Jv_Bigint *l = reent._freelist[i]; -- while (l) -- { -- struct _Jv_Bigint *next = l->_next; -- free (l); -- l = next; -- } -+ free_Bigints(reent._freelist[i]); - } - if (reent._freelist) - free (reent._freelist); -+ -+ if (reent._result) -+ free(reent._result); -+ -+ free_Bigints(reent._p5s); - } ---- classpath-0.99.orig/native/jni/java-lang/java_lang_VMDouble.c 2008-02-08 09:42:57.000000000 -0800 -+++ classpath-0.99/native/jni/java-lang/java_lang_VMDouble.c 2014-12-21 14:35:50.733800626 -0800 -@@ -158,6 +158,17 @@ Java_java_lang_VMDouble_longBitsToDouble - return val.d; - } - -+static void free_Bigints(struct _Jv_Bigint *p) -+{ -+ struct _Jv_Bigint *l = p; -+ while (l) -+ { -+ struct _Jv_Bigint *next = l->_next; -+ free (l); -+ l = next; -+ } -+} -+ - /** - * Parse a double from a char array. - */ -@@ -167,7 +178,7 @@ parseDoubleFromChars(JNIEnv * env, const - char *endptr; - jdouble val = 0.0; - const char *p = buf, *end, *last_non_ws, *temp; -- int ok = 1; -+ int i, ok = 1; - - #ifdef DEBUG - fprintf (stderr, "java.lang.VMDouble.parseDouble (%s)\n", buf); -@@ -224,6 +235,18 @@ parseDoubleFromChars(JNIEnv * env, const - - val = _strtod_r (&reent, p, &endptr); - -+ for (i = 0; i < reent._max_k; ++i) -+ { -+ free_Bigints(reent._freelist[i]); -+ } -+ if (reent._freelist) -+ free (reent._freelist); -+ -+ if (reent._result) -+ free (reent._result); -+ -+ free_Bigints(reent._p5s); -+ - #ifdef DEBUG - fprintf (stderr, "java.lang.VMDouble.parseDouble val = %g\n", val); - fprintf (stderr, "java.lang.VMDouble.parseDouble %p != %p ???\n", diff --git a/libs/classpath/patches/020-fix-statement-may-fall-through.patch b/libs/classpath/patches/020-fix-statement-may-fall-through.patch deleted file mode 100644 index b31575739c..0000000000 --- a/libs/classpath/patches/020-fix-statement-may-fall-through.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/native/jni/java-math/gnu_java_math_GMP.c -+++ b/native/jni/java-math/gnu_java_math_GMP.c -@@ -1132,6 +1132,7 @@ - break; - case 1: - res = mpz_popcount (_this); -+ __attribute__((fallthrough)); - default: - JCL_ThrowException (env, "java/lang/Error", - "Unexpected sign value for a native MPI"); From 65ef6c646af7906f066badde93521b25c8445cdc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:33:06 -0700 Subject: [PATCH 12/20] fcgi: remove Nothing uses this. Signed-off-by: Rosen Penev --- libs/fcgi/Makefile | 77 ------------------- .../fcgi/patches/100-fcgio-int-type-fix.patch | 35 --------- 2 files changed, 112 deletions(-) delete mode 100644 libs/fcgi/Makefile delete mode 100644 libs/fcgi/patches/100-fcgio-int-type-fix.patch diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile deleted file mode 100644 index 32acaefc6b..0000000000 --- a/libs/fcgi/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fcgi -PKG_VERSION:=2.4.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)2-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/FastCGI-Archives/fcgi2/tar.gz/$(PKG_VERSION)? -PKG_HASH:=1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-$(PKG_VERSION) - -PKG_MAINTAINER:=Jacob Siverskog -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE.TERMS - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/uclibc++.mk -include $(INCLUDE_DIR)/package.mk - -define Package/fcgi/Default - SECTION:=libs - CATEGORY:=Libraries - URL:=https://fastcgi-archives.github.io/ -endef - -define Package/fcgi - $(call Package/fcgi/Default) - MENU:=1 - DEPENDS:=+libpthread - TITLE:=Shared library of FastCGI -endef - -define Package/fcgixx - $(call Package/fcgi/Default) - DEPENDS:=fcgi $(CXX_DEPENDS) - TITLE:=Shared library of FastCGI++ -endef - -define Package/fcgi/description - FastCGI is a language independent, scalable, open extension to - CGI that provides high performance without the limitations of - server specific APIs. -endef - -TARGET_CXXFLAGS += -fno-rtti -flto -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi{,++}.{a,so*} $(1)/usr/lib/ -endef - -define Package/fcgi/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/ -endef - -define Package/fcgixx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi++.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fcgi)) -$(eval $(call BuildPackage,fcgixx)) diff --git a/libs/fcgi/patches/100-fcgio-int-type-fix.patch b/libs/fcgi/patches/100-fcgio-int-type-fix.patch deleted file mode 100644 index 1aec5f04c7..0000000000 --- a/libs/fcgi/patches/100-fcgio-int-type-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/include/fcgio.h -+++ b/include/fcgio.h -@@ -77,10 +77,10 @@ protected: - virtual int sync(); - - // Remove and return the current character. -- virtual int uflow(); -+ virtual int_type uflow(); - - // Fill the get area (if buffered) and return the current character. -- virtual int underflow(); -+ virtual int_type underflow(); - - // Use a buffer. The only reasons that a buffer would be useful is - // to support the use of the unget()/putback() or seek() methods. Using ---- a/libfcgi/fcgio.cpp -+++ b/libfcgi/fcgio.cpp -@@ -86,7 +86,7 @@ int fcgi_streambuf::sync() - } - - // uflow() removes the char, underflow() doesn't --int fcgi_streambuf::uflow() -+std::basic_streambuf::int_type fcgi_streambuf::uflow() - { - if (this->bufsize) - { -@@ -100,7 +100,7 @@ int fcgi_streambuf::uflow() - } - } - --int fcgi_streambuf::underflow() -+std::basic_streambuf::int_type fcgi_streambuf::underflow() - { - if (this->bufsize) - { From e0777387514c02201c8f38a6ed47887103a276a8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:34:00 -0700 Subject: [PATCH 13/20] fftw3: remove Nothing uses this. Signed-off-by: Rosen Penev --- libs/fftw3/Makefile | 120 -------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 libs/fftw3/Makefile diff --git a/libs/fftw3/Makefile b/libs/fftw3/Makefile deleted file mode 100644 index ee57a522b2..0000000000 --- a/libs/fftw3/Makefile +++ /dev/null @@ -1,120 +0,0 @@ -# -# Copyright (C) 2007-2018 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fftw3 -PKG_VERSION:=3.3.8 -PKG_RELEASE:=2 -PKG_LICENSE:=GPL-2.0-or-later - -PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.fftw.org -PKG_HASH:=6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 - -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/fftw-$(PKG_VERSION) -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/fftw3 - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libpthread - VARIANT:=double - TITLE:=Fast Fourier transform library - URL:=http://www.fftw.org/ - MAINTAINER:=Vladimir Ulrich -endef - -define Package/fftw3f - $(call Package/fftw3) - VARIANT:=single - TITLE+= (single precision) -endef - -define Package/fftw3l - $(call Package/fftw3) - VARIANT:=long-double - TITLE+= (long-double precision) -endef - -define Package/fftw3/description - FFTW is a collection of fast C routines for computing the - Discrete Fourier Transform in one or more dimensions. It - includes complex, real, and parallel transforms, and can - handle arbitrary array sizes efficiently. -endef - -define Package/fftw3f/description - $(call Package/fftw3/description) - - This package contains the single precision library. -endef - -define Package/fftw3l/description - $(call Package/fftw3/description) - - This package contains the long-double precision library. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --prefix=/usr \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --enable-shared \ - --enable-threads \ - --enable-type-prefix \ - --disable-debug \ - --disable-fortran \ - --disable-doc - -ifeq ($(BUILD_VARIANT), single) -CONFIGURE_ARGS += \ - $(if $(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),--enable-neon) \ - --enable-single -endif - -ifeq ($(BUILD_VARIANT), long-double) -CONFIGURE_ARGS += \ - --enable-long-double -endif - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fftw3.h $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.{a,la} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.so* $(1)/usr/lib - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ -endef - -define Package/fftw3/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3.so* $(1)/usr/lib/ -endef - -define Package/fftw3f/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3f.so* $(1)/usr/lib/ -endef - -define Package/fftw3l/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3l.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,fftw3)) -$(eval $(call BuildPackage,fftw3f)) -$(eval $(call BuildPackage,fftw3l)) From 18cdc8a3b51ff9da373452666d63720ff825a7e0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:34:42 -0700 Subject: [PATCH 14/20] glpk: remove Nothing uses this. Signed-off-by: Rosen Penev --- libs/glpk/Makefile | 66 ---------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 libs/glpk/Makefile diff --git a/libs/glpk/Makefile b/libs/glpk/Makefile deleted file mode 100644 index 4933d19500..0000000000 --- a/libs/glpk/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2010-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=glpk -PKG_VERSION:=4.65 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=4281e29b628864dfe48d393a7bedd781e5b475387c20d8b0158f329994721a10 - -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Daniel Golle - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libglpk - SECTION:=libs - CATEGORY:=Libraries - TITLE:=The GNU Linear Programming Kit - URL:=https://www.gnu.org/software/glpk/ -endef - -define Package/libglpk/description - The GLPK (GNU Linear Programming Kit) package is intended for solving - large-scale linear programming (LP), mixed integer programming (MIP), - and other related problems. It is a set of routines written in ANSI C - and organized in the form of a callable library. -endef - -define Package/glpsol - SECTION:=libs - CATEGORY:=Libraries - TITLE:=The GNU Linear Programming Kit (glpsol) - URL:=https://www.gnu.org/software/glpk/ - DEPENDS:=libglpk -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ -endef - -define Package/libglpk/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ -endef - -define Package/glpsol/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/glpsol $(1)/usr/bin -endef - -$(eval $(call BuildPackage,libglpk)) -$(eval $(call BuildPackage,glpsol)) From fbb258ab8b942a1e2e95b268806f5feebb6d4cf6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:36:06 -0700 Subject: [PATCH 15/20] gperf: remove Does not seem to be used. Signed-off-by: Rosen Penev --- libs/gperf/Makefile | 47 ------------------- .../gperf/patches/100-include_own_first.patch | 26 ---------- 2 files changed, 73 deletions(-) delete mode 100644 libs/gperf/Makefile delete mode 100644 libs/gperf/patches/100-include_own_first.patch diff --git a/libs/gperf/Makefile b/libs/gperf/Makefile deleted file mode 100644 index 5035895c48..0000000000 --- a/libs/gperf/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2006-2017 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gperf -PKG_VERSION:=3.1 -PKG_RELEASE:=1 -PKG_HASH:=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/gperf -PKG_HOST_ONLY=1 - -PKG_MAINTAINER:=Espen Jürgensen -PKG_LICENSE:=GPL-3.0 -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/package.mk - -define Package/gperf - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GNU gperf - BUILDONLY:=1 - URL:=http://www.gnu.org/software/gperf -endef - -define Package/gperf/description - GNU gperf is a perfect hash function generator. For a given list of strings, it - produces a hash function and hash table, in form of C or C++ code, for looking - up a value depending on the input string. The hash function is perfect, which - means that the hash table has no collisions, and the hash table lookup needs a - single string comparison only. -endef - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) install -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,gperf)) diff --git a/libs/gperf/patches/100-include_own_first.patch b/libs/gperf/patches/100-include_own_first.patch deleted file mode 100644 index 6936f35db2..0000000000 --- a/libs/gperf/patches/100-include_own_first.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/Makefile.in b/lib/Makefile.in -index 29bbf92..cf2bf3c 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -61,7 +61,7 @@ SHELL = /bin/sh - VPATH = $(srcdir) - - OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) getline.$(OBJEXT) hash.$(OBJEXT) --CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -+CPPFLAGS = -I$(srcdir) @CPPFLAGS@ - - TARGETLIB = libgp.a - -diff --git a/src/Makefile.in b/src/Makefile.in -index 6866ffd..bd4df14 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -64,7 +64,7 @@ VPATH = $(srcdir) - OBJECTS = version.$(OBJEXT) positions.$(OBJEXT) options.$(OBJEXT) keyword.$(OBJEXT) keyword-list.$(OBJEXT) \ - input.$(OBJEXT) bool-array.$(OBJEXT) hash-table.$(OBJEXT) search.$(OBJEXT) output.$(OBJEXT) main.$(OBJEXT) - LIBS = ../lib/libgp.a @GPERF_LIBM@ --CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir)/../lib -+CPPFLAGS = -I. -I$(srcdir)/../lib @CPPFLAGS@ - - TARGETPROG = gperf$(EXEEXT) - From 702818d5aece94e78966b1ba2a40838586cee606 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:37:07 -0700 Subject: [PATCH 16/20] libavl: remove Does not seem to be used. Signed-off-by: Rosen Penev --- libs/libavl/Makefile | 55 ------------------- .../patches/010-update_GNUmakefile.patch | 45 --------------- 2 files changed, 100 deletions(-) delete mode 100644 libs/libavl/Makefile delete mode 100644 libs/libavl/patches/010-update_GNUmakefile.patch diff --git a/libs/libavl/Makefile b/libs/libavl/Makefile deleted file mode 100644 index da093da04d..0000000000 --- a/libs/libavl/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2006-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libavl -PKG_VERSION:=0.3.5 -PKG_RELEASE:=2 -PKG_HASH:=4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 - -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/liba/libavl -PKG_BUILD_DIR:=$(BUILD_DIR)/avl-$(PKG_VERSION) -PKG_INSTALL:=1 - -PKG_MAINTAINER:=Espen Jürgensen -PKG_LICENSE:=LGPL-2.0-or-later -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/package.mk - -define Package/libavl - SECTION:=libs - CATEGORY:=Libraries - TITLE:=AVLTree (this is not GNU libavl) - URL:=https://packages.debian.org/wheezy/libavl1 -endef - -define Package/libavl/description - AVLTree is a small implementation of AVL trees for the C programming language. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/avl.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavl.so* $(1)/usr/lib/ -endef - -define Package/libavl/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavl.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libavl)) diff --git a/libs/libavl/patches/010-update_GNUmakefile.patch b/libs/libavl/patches/010-update_GNUmakefile.patch deleted file mode 100644 index 3013949155..0000000000 --- a/libs/libavl/patches/010-update_GNUmakefile.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/GNUmakefile 2002-11-15 19:57:48.000000000 +0100 -+++ a/GNUmakefile 2014-10-02 16:03:02.864803002 +0200 -@@ -6,7 +6,7 @@ - LDCONFIG ?= /sbin/ldconfig - - # Some suggestions: (-mcpu= generates i386 compatible code) --CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w -+CFLAGS ?= -O2 -pipe -Wall -Werror - #CFLAGS = -O2 -fomit-frame-pointer -pipe -march=i586 -Wall -g - #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i586 -Wall -ansi -pedantic - #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i686 -Wall -ansi -pedantic -@@ -15,10 +15,9 @@ - #CFLAGS = -g -pg -a -pipe -march=i686 -Wall - #LDFLAGS = -s - --prefix ?= /usr/local -+prefix ?= /usr - libdir ?= $(prefix)/lib - includedir ?= $(prefix)/include --includedir ?= /usr/include - - PROGRAMS = avlsort setdiff - LIBRARY = libavl.so.1.5 -@@ -34,16 +33,17 @@ - $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - $(LIBRARY): avl.o -- $(CC) -nostdlib -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc -+ $(CC) -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc - - clean: - $(RM) *.o $(PROGRAMS) libavl.* - - install: all - $(INSTALL) -d $(DESTDIR)$(libdir) -- $(INSTALL) avl.h $(DESTDIR)$(includedir) -- $(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir) -- for i in $(LIBRARIES); do\ -+ $(INSTALL) -d $(DESTDIR)$(includedir) -+ $(INSTALL) -m 644 avl.h $(DESTDIR)$(includedir) -+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) -+ for i in $(LIBRARY); do\ - $(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\ - $(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\ - done From 3106071c283cdfb75816c38392c88f75f00f522b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:40:41 -0700 Subject: [PATCH 17/20] libglog: remove Was used by libfolly. Signed-off-by: Rosen Penev --- libs/libglog/Makefile | 48 ------------------- .../patches/100-fix-musl-compilation.patch | 13 ----- libs/libglog/patches/110-nanosleep.patch | 24 ---------- 3 files changed, 85 deletions(-) delete mode 100644 libs/libglog/Makefile delete mode 100644 libs/libglog/patches/100-fix-musl-compilation.patch delete mode 100644 libs/libglog/patches/110-nanosleep.patch diff --git a/libs/libglog/Makefile b/libs/libglog/Makefile deleted file mode 100644 index f70b7a1cf9..0000000000 --- a/libs/libglog/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=glog -PKG_VERSION:=0.4.0 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/google/glog/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c - -PKG_MAINTAINER:=Amir Sabbaghi -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=COPYING - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/glog - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C++ implementation of the Google logging module - DEPENDS:=+libstdcpp +libpthread +gflags - URL:=https://github.com/google/glog -endef - -define Package/glog/description - This repository contains a C++ implementation of the Google logging - module. Documentation for the implementation is in doc/. -endef - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF \ - -DUNWIND_LIBRARY=OFF - -TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_CFLAGS += -Wl,--gc-sections - -define Package/glog/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libglog.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,glog)) diff --git a/libs/libglog/patches/100-fix-musl-compilation.patch b/libs/libglog/patches/100-fix-musl-compilation.patch deleted file mode 100644 index dab64bec85..0000000000 --- a/libs/libglog/patches/100-fix-musl-compilation.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: glog-0.4.0/src/symbolize_unittest.cc -=================================================================== ---- glog-0.4.0.orig/src/symbolize_unittest.cc -+++ glog-0.4.0/src/symbolize_unittest.cc -@@ -401,7 +401,7 @@ int main(int argc, char **argv) { - FLAGS_logtostderr = true; - InitGoogleLogging(argv[0]); - InitGoogleTest(&argc, argv); --#if defined(HAVE_SYMBOLIZE) -+#if defined(HAVE_SYMBOLIZE) && defined(HAVE_STACKTRACE) - # if defined(__ELF__) - // We don't want to get affected by the callback interface, that may be - // used to install some callback function at InitGoogle() time. diff --git a/libs/libglog/patches/110-nanosleep.patch b/libs/libglog/patches/110-nanosleep.patch deleted file mode 100644 index 8d1a2ffa0c..0000000000 --- a/libs/libglog/patches/110-nanosleep.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d7b02b6929baf5b21ee6e15a700b4fc82d962e9c Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Thu, 25 Jul 2019 19:14:42 -0700 -Subject: [PATCH] googletest: Switch to nanosleep - -usleep is deprecated and optionally not available with uClibc-ng. ---- - src/googletest.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/googletest.h b/src/googletest.h -index 49ddbc0a..39fb29fb 100644 ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -574,7 +574,8 @@ class Thread { - - static inline void SleepForMilliseconds(int t) { - #ifndef OS_WINDOWS -- usleep(t * 1000); -+ const struct timespec req = {0, t * 1000 * 1000}; -+ nanosleep(&req, NULL); - #else - Sleep(t); - #endif From 8415f77bbc11f90d680f861bddb0f8c436dae3f3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:47:14 -0700 Subject: [PATCH 18/20] libuvc: remove Does not seem to be used. Signed-off-by: Rosen Penev --- libs/libuvc/Makefile | 53 -------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 libs/libuvc/Makefile diff --git a/libs/libuvc/Makefile b/libs/libuvc/Makefile deleted file mode 100644 index 08dc939fa7..0000000000 --- a/libs/libuvc/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libuvc - -PKG_VERSION:=0.0.6 -PKG_RELEASE:=1 -PKG_MAINTAINER:=Roger D - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/ktossell/libuvc/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=42175a53c1c704365fdc782b44233925e40c9344fbb7f942181c1090f06e2873 - -PKG_LICENSE:=BSD -PKG_LICENSE_FILES:=LICENSE.txt - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libuvc - SECTION:=libs - CATEGORY:=Libraries - TITLE:=libuvc - DEPENDS:=+libusb-1.0 +libjpeg - URL:=https://int80k.com/libuvc -endef - -define Package/libuvc/description - This package contains libuvc is a cross-platform library for USB video devices, - built atop libusb. -endef - -define Package/libuvc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuvc.so* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{include,lib} - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuvc.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libuvc)) From 9b4308dae61467de434c516046c9d4757c0796ad Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:49:16 -0700 Subject: [PATCH 19/20] libzdb: remove Does not seem to be used. Signed-off-by: Rosen Penev --- libs/libzdb/Makefile | 89 ------------------- .../patches/010-do-not-run-test-progs.patch | 19 ---- .../020-filterh-use-host-built-version.patch | 11 --- 3 files changed, 119 deletions(-) delete mode 100644 libs/libzdb/Makefile delete mode 100644 libs/libzdb/patches/010-do-not-run-test-progs.patch delete mode 100644 libs/libzdb/patches/020-filterh-use-host-built-version.patch diff --git a/libs/libzdb/Makefile b/libs/libzdb/Makefile deleted file mode 100644 index fc27d114b3..0000000000 --- a/libs/libzdb/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (C) 2007-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libzdb -PKG_VERSION:=3.2.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.tildeslash.com/libzdb/dist/ -PKG_HASH:=b9a7b59a0a9f53dc87ce1b5a919f21b8cd6448c04a9157bccef1e3c1dffd3ff1 - -PKG_MAINTAINER:=Alexandru Ardelean -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=COPYING - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=libzdb/host -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/uclibc++.mk -include $(INCLUDE_DIR)/package.mk -# libzdb needs to find iconv when linking to libmariadb -include $(INCLUDE_DIR)/nls.mk -include $(INCLUDE_DIR)/host-build.mk - -define Package/libzdb - SECTION:=libs - CATEGORY:=Libraries - TITLE:=A thread-safe multi database connection pool library - URL:=https://www.tildeslash.com/libzdb/ - DEPENDS:=+libsqlite3 +libpq +libmysqlclient +zlib +libpthread +libopenssl -endef - -define Package/libzdb/description - zdb is a database library with thread-safe connection pooling. The library can connect - transparently to multiple database systems. It has zero runtime configuration and connections - are specified via a URL scheme. A modern object-oriented API is provided. - zdb supports MySQL, PostgreSQL, SQLite, and Oracle. - NOTE: This package does not include Oracle support. -endef - -CONFIGURE_ARGS += \ - --disable-profiling \ - --enable-optimized \ - --enable-protected \ - --enable-sqliteunlock \ - --enable-openssl - -CONFIGURE_VARS += \ - libzdb_cv_setjmp_available=yes \ - libzdb_cv_vsnprintf_c11_conformant=yes - -define Hooks/HostConfigure/Pre -endef - -define Host/Configure -endef - -define Host/Compile - $(HOSTCC) $(HOST_BUILD_DIR)/tools/filterh/lex.yy.c -o $(HOST_BUILD_DIR)/tools/bin/filterh -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOSTPKG)/bin -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/zdb - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zdb/* $(1)/usr/include/zdb - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb* $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zdb.pc $(1)/usr/lib/pkgconfig -endef - -define Package/libzdb/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb.so* $(1)/usr/lib -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,libzdb)) diff --git a/libs/libzdb/patches/010-do-not-run-test-progs.patch b/libs/libzdb/patches/010-do-not-run-test-progs.patch deleted file mode 100644 index 77b7e50a64..0000000000 --- a/libs/libzdb/patches/010-do-not-run-test-progs.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -454,16 +454,6 @@ if test $ondarwin -eq 1; then - else - stdc="gnu" - fi --AC_RUN_IFELSE( --[AC_LANG_PROGRAM([], [dnl -- #ifdef __STDC_VERSION__ -- #if __STDC_VERSION__ >= 201112L -- return 0; -- #endif -- #endif -- return 1; -- ])], [CFLAGS="$CFLAGS -std=${stdc}11"], [CFLAGS="$CFLAGS -std=${stdc}99"]) --AC_CHECK_HEADERS([stdint.h stdbool.h], [], [AC_MSG_ERROR([toolchain does not have C99 headers])]) - - # --------------------------------------------------------------------------- - # Outputs diff --git a/libs/libzdb/patches/020-filterh-use-host-built-version.patch b/libs/libzdb/patches/020-filterh-use-host-built-version.patch deleted file mode 100644 index 8754a79e21..0000000000 --- a/libs/libzdb/patches/020-filterh-use-host-built-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,7 +12,7 @@ LIBRARY_NAME = zdb - - RE2C = @RE2C@ - RE2CFLAGS = -b --FILTERH = ./tools/bin/filterh -+FILTERH = $(STAGING_DIR_HOSTPKG)/bin/filterh - - AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS) - AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/db/oracle -Isrc/exceptions From 363956127733ca1caaa708d193e9d1cc747c700f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 7 Apr 2020 18:22:31 -0700 Subject: [PATCH 20/20] libcanfestival: remove It seems that nothing uses this. Signed-off-by: Rosen Penev --- libs/libcanfestival/Makefile | 73 ------------------- .../patches/001-sigval-ref-fix.patch | 11 --- .../patches/002-makefile-gcc-linker.patch | 33 --------- .../patches/003-makefile-skip-examples.patch | 20 ----- .../patches/004-override-cflags.patch | 44 ----------- 5 files changed, 181 deletions(-) delete mode 100644 libs/libcanfestival/Makefile delete mode 100644 libs/libcanfestival/patches/001-sigval-ref-fix.patch delete mode 100644 libs/libcanfestival/patches/002-makefile-gcc-linker.patch delete mode 100644 libs/libcanfestival/patches/003-makefile-skip-examples.patch delete mode 100644 libs/libcanfestival/patches/004-override-cflags.patch diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile deleted file mode 100644 index 062c8082bf..0000000000 --- a/libs/libcanfestival/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2015-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libcanfestival -PKG_RELEASE:=7 - -PKG_SOURCE_VERSION:=8bfe0ac00cdb -PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename= -PKG_SOURCE:=CanFestival-3-$(PKG_SOURCE_VERSION).tar.bz2 -PKG_HASH:=0bee7aaef266fc579922ca159b7acbe9cdc9a936ac1f30402814844b007f7185 -PKG_SOURCE_SUBDIR:=CanFestival-3-$(PKG_SOURCE_VERSION) - -PKG_MAINTAINER:=Anton Glukhov - -PKG_LICENSE:=LGPL-2.1-or-later -PKG_LICENSE_FILES:=LICENCE - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) - -TAR_OPTIONS+= -m -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libcanfestival - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Free software CANopen library - URL:=http://canfestival.org - DEPENDS:=+libpthread +librt -endef - -define Package/libcanfestival/description - CanFestival library -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS := \ - --cc=$(TARGET_CC) \ - --cxx=$(TARGET_CXX) \ - --ld=$(TARGET_CC) \ - --arch=$(ARCH) \ - --binutils=$(TARGET_CROSS) \ - --os=Linux \ - --kerneldir=$(LINUX_DIR) \ - --prefix=/usr \ - --target=unix \ - --can=socket \ - --timers=unix \ - --debug=ERR \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ -endef - -define Package/libcanfestival/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcanfestival_can_socket.so $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libcanfestival)) diff --git a/libs/libcanfestival/patches/001-sigval-ref-fix.patch b/libs/libcanfestival/patches/001-sigval-ref-fix.patch deleted file mode 100644 index 7e15ff1674..0000000000 --- a/libs/libcanfestival/patches/001-sigval-ref-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/timers_unix/timers_unix.c -+++ b/drivers/timers_unix/timers_unix.c -@@ -33,7 +33,7 @@ - } - } - --void timer_notify(sigval_t val) -+void timer_notify(void) - { - if(gettimeofday(&last_sig,NULL)) { - perror("gettimeofday()"); diff --git a/libs/libcanfestival/patches/002-makefile-gcc-linker.patch b/libs/libcanfestival/patches/002-makefile-gcc-linker.patch deleted file mode 100644 index 129743f084..0000000000 --- a/libs/libcanfestival/patches/002-makefile-gcc-linker.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/examples/TestMasterMicroMod/Makefile.in -+++ b/examples/TestMasterMicroMod/Makefile.in -@@ -56,7 +56,7 @@ - - - $(TESTMASTERMICROMOD): $(OBJS) -- $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) -+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) - - - TestMaster.c: TestMaster.od ---- a/examples/TestMasterSlave/Makefile.in -+++ b/examples/TestMasterSlave/Makefile.in -@@ -65,7 +65,7 @@ - - - $(TESTMASTERSLAVE): $(OBJS) -- $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) -+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) - - TestSlave.c: TestSlave.od - $(MAKE) -C ../../objdictgen gnosis ---- a/examples/CANOpenShell/Makefile.in -+++ b/examples/CANOpenShell/Makefile.in -@@ -64,7 +64,7 @@ - $(MAKE) -C ../../drivers/$(TARGET) libcanfestival_$(TARGET).a - - $(CANOPENSHELL): $(OBJS) -- $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) -+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) - mkdir -p Debug; cp $(CANOPENSHELL) Debug - - CANOpenShellMasterOD.c: CANOpenShellMasterOD.od diff --git a/libs/libcanfestival/patches/003-makefile-skip-examples.patch b/libs/libcanfestival/patches/003-makefile-skip-examples.patch deleted file mode 100644 index e52fc6ab2f..0000000000 --- a/libs/libcanfestival/patches/003-makefile-skip-examples.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -21,7 +21,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --all: objdictedit canfestival examples -+all: objdictedit canfestival - - examples: canfestival driver - $(MAKE) -C examples all -@@ -44,7 +44,7 @@ driver: - install: canfestival driver - $(MAKE) -C drivers $@ - $(MAKE) -C src $@ -- $(MAKE) -C examples $@ -+ #$(MAKE) -C examples $@ - $(MAKE) -C objdictgen $@ - ldconfig - diff --git a/libs/libcanfestival/patches/004-override-cflags.patch b/libs/libcanfestival/patches/004-override-cflags.patch deleted file mode 100644 index 8dfb39600e..0000000000 --- a/libs/libcanfestival/patches/004-override-cflags.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/drivers/can_socket/Makefile.in -+++ b/drivers/can_socket/Makefile.in -@@ -23,7 +23,7 @@ - - CC = SUB_CC - OPT_CFLAGS = -O2 --CFLAGS = SUB_OPT_CFLAGS -+CFLAGS ?= SUB_OPT_CFLAGS - PROG_CFLAGS = SUB_PROG_CFLAGS - PREFIX = SUB_PREFIX - TARGET = SUB_TARGET ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -101,7 +101,7 @@ uninstall: - rm -rf $(DESTDIR)$(PREFIX)/include/canfestival - - else --CFLAGS = SUB_OPT_CFLAGS -+CFLAGS ?= SUB_OPT_CFLAGS - - ifeq ($(TARGET),none) - canfestival: libcanfestival.o ---- a/drivers/unix/Makefile.in -+++ b/drivers/unix/Makefile.in -@@ -85,7 +85,7 @@ install: - - - else --CFLAGS = SUB_OPT_CFLAGS -+CFLAGS ?= SUB_OPT_CFLAGS - - driver: libcanfestival_$(TARGET).a - ---- a/drivers/timers_unix/Makefile.in -+++ b/drivers/timers_unix/Makefile.in -@@ -23,7 +23,7 @@ - - CC = SUB_CC - OPT_CFLAGS = -O2 --CFLAGS = SUB_OPT_CFLAGS -+CFLAGS ?= SUB_OPT_CFLAGS - PROG_CFLAGS = SUB_PROG_CFLAGS - OS_NAME = SUB_OS_NAME - ARCH_NAME = SUB_ARCH_NAME