aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2019-09-19 17:39:15 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2019-09-20 19:30:51 +0200
commit977a8fc5fc2e1be6d159b2d9e1c617826b5d9701 (patch)
treea4f8d94d252e3d67cf7786474ebdc71b382b64ac
parent9edd7edcda68b2739296d8ea97e8c4915070d5b9 (diff)
downloadupstream-977a8fc5fc2e1be6d159b2d9e1c617826b5d9701.tar.gz
upstream-977a8fc5fc2e1be6d159b2d9e1c617826b5d9701.tar.bz2
upstream-977a8fc5fc2e1be6d159b2d9e1c617826b5d9701.zip
uClibc++: Remove faulty patch
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>
-rw-r--r--package/libs/uclibc++/Makefile2
-rw-r--r--package/libs/uclibc++/patches/002-quote-fix.patch13
2 files changed, 1 insertions, 14 deletions
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 $@