File wanpipe-user-compilefixes.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File wanpipe-user-compilefixes.diff of Package wanpipe (Revision ffc4af21d32b115b0d86dabd5f5682d1)

Currently displaying revision ffc4af21d32b115b0d86dabd5f5682d1 , Show latest

Not even propagation of variables correctly works with that set
of crap Makefiles.

Index: wanpipe-3.5.18/Makefile
===================================================================
--- wanpipe-3.5.18.orig/Makefile
+++ wanpipe-3.5.18/Makefile
@@ -15,7 +15,7 @@ PWD=$(shell pwd)
 KBUILD_VERBOSE=0
 CC=gcc
 
-EXTRA_CFLAGS=
+EXTRA_CFLAGS=-Wno-strict-aliasing
 EXTRA_FLAGS=
 
 #Default zaptel directory to be overwritten by user
Index: wanpipe-3.5.18/util/wan_aftup/Makefile.Linux
===================================================================
--- wanpipe-3.5.18.orig/util/wan_aftup/Makefile.Linux
+++ wanpipe-3.5.18/util/wan_aftup/Makefile.Linux
@@ -36,10 +36,10 @@ 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)
+CFLAGS += -I/usr/include -I$(WANINCDIR) -I$(SYSINC) -Wno-strict-aliasing
 
 BINS=`ls *.BIN`
 
@@ -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.18/util/wan_plxctrl/Makefile
===================================================================
--- wanpipe-3.5.18.orig/util/wan_plxctrl/Makefile
+++ wanpipe-3.5.18/util/wan_plxctrl/Makefile
@@ -27,7 +27,7 @@ WAN_VIRTUAL=
 PRODS=wan_plxup
 
 # Tools options.
-CFLAGS  = -Wall -O2 -D$(OS_TYPE) -D_DEBUG_=$(DEBUG)
+CFLAGS  = -Wall -O2 -D$(OS_TYPE) -D_DEBUG_=$(DEBUG) -Wno-strict-aliasing
 CFLAGS  += $(EXTRA_FLAGS) -I$(SYSINC)
 
 
Index: wanpipe-3.5.18/util/wanconfig/Makefile
===================================================================
--- wanpipe-3.5.18.orig/util/wanconfig/Makefile
+++ wanpipe-3.5.18/util/wanconfig/Makefile
@@ -25,7 +25,7 @@ WAN_VIRTUAL=
 
 # Tools options.
 SRCS=wanconfig.c wanconfig_hwec.c $(DIR_EC_APILIB)/wanec_api.c $(DIR_EC_APILIB)/wanec_api_lib.c
-CFLAGS = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -D_DEBUG_=$(DEBUG)
+CFLAGS = -Wall -O2 -D$(OS_TYPE) -I$(SYSINC) -D_DEBUG_=$(DEBUG) -Wno-strict-aliasing
 CFLAGS += -DCONFIG_PRODUCT_WANPIPE_AFT_BRI -DCONFIG_PRODUCT_WANPIPE_USB
 CFLAGS += -I../../patches/kdrivers/include -I$(SYSINC)
 CFLAGS += -I$(DIR_EC_APILIB)
Index: wanpipe-3.5.18/util/wanconfig/wanconfig.c
===================================================================
--- wanpipe-3.5.18.orig/util/wanconfig/wanconfig.c
+++ wanpipe-3.5.18/util/wanconfig/wanconfig.c
@@ -2266,7 +2266,7 @@ int set_conf_param (char* key, char* val
 		break;
 
 	case DTYPE_PTR:
-		*(void**)((char*)conf + dtab->offset) = (void*)tmp;
+		*(void **)((char *)conf + dtab->offset) = (void *)(long)tmp;
 		break;
 	}
 	return 0;
Index: wanpipe-3.5.18/util/wanctl/Makefile
===================================================================
--- wanpipe-3.5.18.orig/util/wanctl/Makefile
+++ wanpipe-3.5.18/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
Index: wanpipe-3.5.18/util/wanpipemon/Makefile.Linux
===================================================================
--- wanpipe-3.5.18.orig/util/wanpipemon/Makefile.Linux
+++ wanpipe-3.5.18/util/wanpipemon/Makefile.Linux
@@ -30,7 +30,7 @@ CPP = gcc -E
 CFLAGS = -Wall -Wstrict-prototypes 
 CFLAGS += $(EXTRA_FLAGS) $(PROTOCOL_DEFS)
 CFLAGS += $(GLOBAL_CFLAGS)
-CFLAGS +=  -D$(OS_TYPE) -I$(SYSINC) -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG)
+CFLAGS +=  -D$(OS_TYPE) -I$(SYSINC) -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG) -Wno-strict-aliasing
 WAN_VIRTUAL=
 
 
Index: wanpipe-3.5.18/util/wanpipemon/aftpipemon.c
===================================================================
--- wanpipe-3.5.18.orig/util/wanpipemon/aftpipemon.c
+++ wanpipe-3.5.18/util/wanpipemon/aftpipemon.c
@@ -507,7 +507,7 @@ static void operational_stats (void)
 	DO_COMMAND(wan_udp);
 
 	if (wan_udp.wan_udphdr_data_len  != sizeof(wanpipe_chan_stats_t)) {
-     	 printf("Error: op stats data_len=%i != stats %i\n",
+     	 printf("Error: op stats data_len=%d != stats %zu\n",
 		 		     wan_udp.wan_udphdr_data_len,sizeof(wanpipe_chan_stats_t));  
 	}
 
Index: wanpipe-3.5.18/util/wanpipemon_legacy/Makefile
===================================================================
--- wanpipe-3.5.18.orig/util/wanpipemon_legacy/Makefile
+++ wanpipe-3.5.18/util/wanpipemon_legacy/Makefile
@@ -32,7 +32,7 @@ PROTOCOL_DEFS=
 CC = gcc 
 CPP = gcc -E
 CFLAGS = -Wall -Wstrict-prototypes -D$(OS_TYPE) -I../ft1 -O2 -fomit-frame-pointer -DLOCALE -D_DEBUG_=$(DEBUG) -DCURSES_LOC="<ncurses.h>"
-CFLAGS += -I$(SYSINC)
+CFLAGS += -I$(SYSINC) -Wno-strict-aliasing
 WAN_VIRTUAL=
 
 CFLAGS += $(EXTRA_FLAGS)

Places

File wanpipe-user-compilefixes.diff of Package wanpipe (Revision ffc4af21d32b115b0d86dabd5f5682d1)

Places