From 9acb36ef4ec063ede28fda133a14c098502ba1c6 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 15 Jun 2025 08:16:44 +0200 Subject: [PATCH] treewide: drop patches related to uClibc-ng These patches seems leftovers, because uClibc-ng was removed from OpenWrt main repo in 2020 [1]. If someone is uses still uClibc-ng, then these patches should be upstreamed. [1] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=63fb175203bbf3b336804587c2f5b3a2d8132ec1 Signed-off-by: Josef Schlehofer --- net/ibrdtnd/Makefile | 2 +- net/ibrdtnd/patches/020-uClibc-ng.patch | 20 ----------------- net/uwsgi/Makefile | 2 +- net/uwsgi/patches/010-uclibc-ng.patch | 11 ---------- sound/espeak/Makefile | 2 +- sound/espeak/patches/010-uclibcxx.patch | 21 ------------------ utils/device-observatory/Makefile | 2 +- .../patches/010-uClibc-ng.patch | 22 ------------------- 8 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 net/ibrdtnd/patches/020-uClibc-ng.patch delete mode 100644 net/uwsgi/patches/010-uclibc-ng.patch delete mode 100644 sound/espeak/patches/010-uclibcxx.patch delete mode 100644 utils/device-observatory/patches/010-uClibc-ng.patch diff --git a/net/ibrdtnd/Makefile b/net/ibrdtnd/Makefile index f3e4bb5d0a..8e392f92ea 100644 --- a/net/ibrdtnd/Makefile +++ b/net/ibrdtnd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtnd PKG_VERSION:=1.0.1 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases diff --git a/net/ibrdtnd/patches/020-uClibc-ng.patch b/net/ibrdtnd/patches/020-uClibc-ng.patch deleted file mode 100644 index abe2209ae6..0000000000 --- a/net/ibrdtnd/patches/020-uClibc-ng.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/security/SecurityCertificateManager.cpp -+++ b/src/security/SecurityCertificateManager.cpp -@@ -23,6 +23,7 @@ - #include "Configuration.h" - - #include -+#include - - #include - #include ---- a/src/security/SecurityManager.cpp -+++ b/src/security/SecurityManager.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #ifdef __DEVELOPMENT_ASSERTIONS__ - #include diff --git a/net/uwsgi/Makefile b/net/uwsgi/Makefile index 42bc3e3aa3..58605b4edb 100644 --- a/net/uwsgi/Makefile +++ b/net/uwsgi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uwsgi PKG_VERSION:=2.0.26 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=uWSGI PYPI_SOURCE_NAME:=uwsgi diff --git a/net/uwsgi/patches/010-uclibc-ng.patch b/net/uwsgi/patches/010-uclibc-ng.patch deleted file mode 100644 index e98bab3e03..0000000000 --- a/net/uwsgi/patches/010-uclibc-ng.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/core/uwsgi.c -+++ b/core/uwsgi.c -@@ -1794,7 +1794,7 @@ void uwsgi_plugins_atexit(void) { - - void uwsgi_backtrace(int depth) { - --#if defined(__GLIBC__) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO) -+#if (!defined(__UCLIBC__) && defined(__GLIBC__)) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO) - - #include - diff --git a/sound/espeak/Makefile b/sound/espeak/Makefile index 634b040f47..0d7afedac6 100644 --- a/sound/espeak/Makefile +++ b/sound/espeak/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=espeak PKG_VERSION:=1.48.04 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.zip PKG_SOURCE_URL:=@SF/espeak diff --git a/sound/espeak/patches/010-uclibcxx.patch b/sound/espeak/patches/010-uclibcxx.patch deleted file mode 100644 index 127df39992..0000000000 --- a/sound/espeak/patches/010-uclibcxx.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compil - - SRCS1=$(speak_SOURCES) - OBJS1=$(patsubst %.cpp,%.o,$(SRCS1)) --LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS) -+LIBS1=$(LIB_AUDIO) -lpthread $(EXTRA_LIBS) - - SRCS2=$(libespeak_SOURCES) - OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2)) --LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread -+LIBS2=$(LIB_AUDIO) -lpthread - - SRCS3 = espeak.cpp - OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) --LIBS3=-lstdc++ -L . -lespeak -+LIBS3=-L . -lespeak - - CXXFLAGS=-O2 - diff --git a/utils/device-observatory/Makefile b/utils/device-observatory/Makefile index e08457fc15..4a41b9a8ca 100644 --- a/utils/device-observatory/Makefile +++ b/utils/device-observatory/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=device-observatory PKG_VERSION:=1.2.0 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE_URL:=https://codeload.github.com/mwarning/device-observatory/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/utils/device-observatory/patches/010-uClibc-ng.patch b/utils/device-observatory/patches/010-uClibc-ng.patch deleted file mode 100644 index 077a971b3d..0000000000 --- a/utils/device-observatory/patches/010-uClibc-ng.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/parse_ether.c -+++ b/src/parse_ether.c -@@ -21,10 +21,18 @@ - #include "parse_ether.h" - - /* tcpdump header (ether.h) defines ETHER_HDRLEN) */ --#ifndef ETHER_HDRLEN -+#ifndef ETHER_HDRLEN - #define ETHER_HDRLEN 14 - #endif - -+/* uClibc-ng compatibility */ -+#ifndef IPPROTO_BEETPH -+#define IPPROTO_BEETPH 94 -+#endif -+ -+#ifndef IPPROTO_MPLS -+#define IPPROTO_MPLS 137 -+#endif - - const char *ip_protcol_str(int p) - {