diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-09-19 17:39:15 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-21 18:08:54 +0200 |
| commit | dc076160f9c5065425d4f8201adbeae32f70910a (patch) | |
| tree | db3a4cea0824593103636cbbfca6372eaac206b3 | |
| parent | e105d03ee9ac5a2392396185139ee9233a6427af (diff) | |
| download | upstream-dc076160f9c5065425d4f8201adbeae32f70910a.tar.gz upstream-dc076160f9c5065425d4f8201adbeae32f70910a.tar.bz2 upstream-dc076160f9c5065425d4f8201adbeae32f70910a.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>
(cherry picked from commit 977a8fc5fc2e1be6d159b2d9e1c617826b5d9701)
| -rw-r--r-- | package/libs/uclibc++/Makefile | 2 | ||||
| -rw-r--r-- | package/libs/uclibc++/patches/002-quote-fix.patch | 13 |
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 $@ |