File wanpipe-01-c-is-not-cpp.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File wanpipe-01-c-is-not-cpp.diff of Package wanpipe (Revision bcec3c49349d9333523b80aaeddc0003)

Currently displaying revision bcec3c49349d9333523b80aaeddc0003 , Show latest

From: Jan Engelhardt <jengelh@medozas.de>
Upstream: tbd

CXXLD absolutely *MUST* be used when there are C++ objects
involved.
(Otherwise, the required libstdc++ won't be linked in.)

[Can't you just use automake, would make things a lot easier.]

---
 util/wan_aftup/Makefile |   12 +++++++++---
 util/wanctl/Makefile    |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

Index: wanpipe-3.5.23.6/util/wan_aftup/Makefile
===================================================================
--- wanpipe-3.5.23.6.orig/util/wan_aftup/Makefile
+++ wanpipe-3.5.23.6/util/wan_aftup/Makefile
@@ -36,7 +36,7 @@ endif
 # Tools options.
 SRCS	= wan_aftup.c wan_aft_prg.c wan_aft_flash.c wan_aft_flash_shark.c wan_aft_flash_shark_ds.c 
 SRCS	+= wan_pcie_ctrl.c wan_pcie_ctrl_plx.c wan_pcie_ctrl_tundra.c wan_aft_flash_a600.c
-SRCS	+= wan_usb_fwupdate.cpp mem.cpp
+SRC2	+= wan_usb_fwupdate.cpp mem.cpp
 CFLAGS  = -Wall -O2 -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -lstdc++
 CFLAGS += $(EXTRA_FLAGS)
 CFLAGS += -I/usr/include -I$(WANINCDIR) -I$(SYSINC)
@@ -49,8 +49,14 @@ BINS=`ls *.BIN`
 all:	$(PROD) 
 	@echo "Ok."
 
-wan_aftup:	$(SRCS)
-	$(CC) $(CFLAGS) -o $@ $^
+%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -o $@ -c $<
+
+wan_aftup: $(patsubst %.c,%.o,${SRCS}) $(patsubst %.cpp,%.o,${SRC2})
+	$(CXX) $(CFLAGS) -o $@ $^
 
 install:
 	@echo "Installing Wanpipe Firmware  update utility in $(WAN_VIRTUAL)/etc/wanpipe/util/wan_aftup"
Index: wanpipe-3.5.23.6/util/wanctl/Makefile
===================================================================
--- wanpipe-3.5.23.6.orig/util/wanctl/Makefile
+++ wanpipe-3.5.23.6/util/wanctl/Makefile
@@ -34,7 +34,7 @@ wanctl: cpp_string.cpp\
     		text_box.cpp menu_base.cpp\
 		    input_box.cpp dialog_base.cpp main.cpp
 
-	$(CC) $(CFLAGS) -o $@ $^ -ll -lm
+	$(CXX) $(CFLAGS) -o $@ $^ -ll -lm
 
 clean:
 	rm -f wanctl

Places

File wanpipe-01-c-is-not-cpp.diff of Package wanpipe (Revision bcec3c49349d9333523b80aaeddc0003)

Places