mirror of https://github.com/hak5/openwrt.git
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 977a8fc5fc
)
openwrt-19.07
parent
e105d03ee9
commit
dc076160f9
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=uclibc++
|
PKG_NAME:=uclibc++
|
||||||
PKG_VERSION:=0.2.5
|
PKG_VERSION:=0.2.5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://cxx.uclibc.org/src/
|
PKG_SOURCE_URL:=https://cxx.uclibc.org/src/
|
||||||
|
|
|
@ -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 $@
|
|
Loading…
Reference in New Issue