[OpenWrt-Devel,PATCHv2] uClibc++: Remove faulty patch
diff mbox series

Message ID 20190920003915.5954-1-rosenp@gmail.com
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series
  • [OpenWrt-Devel,PATCHv2] uClibc++: Remove faulty patch
Related show

Commit Message

Rosen Penev Sept. 20, 2019, 12:39 a.m. UTC
This patch was originally added to fix compilation with v4l2rtspserver.
Turns out it was v4l2rtspserver that was broken, not uClibc++. This now
causes issues with a different package where the arguments are being
split.

Note that with this patch, shellcheck throws an error:

SC2068: Double quote array expansions to avoid re-splitting elements.

More: https://github.com/openwrt/packages/pull/9972#discussion_r324878373

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 v2: Increase PKG_RELEASE
 package/libs/uclibc++/Makefile                    |  2 +-
 package/libs/uclibc++/patches/002-quote-fix.patch | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 package/libs/uclibc++/patches/002-quote-fix.patch

Patch
diff mbox series

diff --git a/package/libs/uclibc++/Makefile b/package/libs/uclibc++/Makefile
index 763e0d9e4d..3adf70b360 100644
--- a/package/libs/uclibc++/Makefile
+++ b/package/libs/uclibc++/Makefile
@@ -10,7 +10,7 @@  include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uclibc++
 PKG_VERSION:=0.2.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://cxx.uclibc.org/src/
diff --git a/package/libs/uclibc++/patches/002-quote-fix.patch b/package/libs/uclibc++/patches/002-quote-fix.patch
deleted file mode 100644
index 49e7ac3d14..0000000000
--- a/package/libs/uclibc++/patches/002-quote-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@ 
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -44,8 +44,8 @@ define do_wrapper
- 	$(Q)echo '	WRAPPER_OPTIONS="$$WRAPPER_OPTIONS -nodefaultlibs $$WRAPPER_LIBDIR -l$(LNAME) $$WRAPPER_LIBS"' >> $@.tmp
- 	$(Q)echo 'fi' >> $@.tmp
- 	$(Q)echo '' >> $@.tmp
--	$(Q)echo '[ -n "$$V" ] && [ $$V -gt 1 ] && echo $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR "$$@" $$WRAPPER_OPTIONS' >> $@.tmp
--	$(Q)echo 'exec $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR "$$@" $$WRAPPER_OPTIONS' >> $@.tmp
-+	$(Q)echo '[ -n "$$V" ] && [ $$V -gt 1 ] && echo $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR $$@ $$WRAPPER_OPTIONS' >> $@.tmp
-+	$(Q)echo 'exec $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR $$@ $$WRAPPER_OPTIONS' >> $@.tmp
- 	$(Q)echo '' >> $@.tmp
- 	$(Q)chmod 0755 $@.tmp
- 	$(Q)mv $@.tmp $@